various fixes for nagios