Fix issues with Tomcat and Nagios