Fixed 2 issues
Migration script