Hacky patches for MCPC+