More tweaks and migration fix
Renamed migration