Final tweaks for a Merry Migration