Fixing migration, maybe for real now ;)