Further fixes for zone reloads