Mpc-hc detection fixes