Additional quick fixes to orm migration