more migration tweaks