migration-fixes

migration fixes
Merge pull request #6 from tintinboss/migration-fixes

migration-fixes