More monit fixes