Fixed more bugs with Monitor