Monitoring fixes