Fixes for bad stuff in monitor