#bug fixes in Monitoring