Finish migration, other fixes