Migration tweaks