Several fixes from refactoring AuxMonitor without testing