Server migration tweaks