Wip mon fixes

A bunch more monitor fixes from Sage to review and get merged.