CRM-12621 - Migrate tweaks

Misc fixes encountered while working on CRM-12621.