Merge pull request #801 from totten/migrate-tweaks