bug fixes to help with tomcat deployment