More mcontrol changes