Fixes and cleaning up for MonitorService