MBC3 fixes