more fixes to migrations