Fixes in monitor