Fix some additional issues int he migration files