Cleaned up migrations
Merge branch 'hotfix/fix_migration_error'