Fixes in monitors