Changes to enable tomcat on Mac OS X