Fixed various migration functions
Merge pull request #1337 from ellensi/MigrationUpdate

Fixed various migration functions