Start/stop monitoring tweaks