A couple minor patches to fix some broken things in nagios