Fixing more migrations errors