mpc fixes