Migraton fixes