MADS: Fixes for actions triggering prematurely