some fixes for MCPC