Additional migration tweaks