Fix MAG_NONE and ACC_NONE cases