more MPCE tweaks