Wip mon fixes

Several more monitor fixes from Sage to review and get merged.