Fix issues that arose in latest migration
Merge pull request #1622 from steventlamb/bug/migrator_issues

Fix issues that arose in latest migration