Minor changes in ServiceMonitor