Various fixes on the monit