Additional tweaks to migrate manual.