MCPC+ fixes