MMC3 tweaks etc