Various fixes for using maven artifacts within Tomcat