Fixes for Nagios