Cleanup: Tweaks to monitors