Fixes to Monitoring