Monit improvements