Two fixes for the case of simple plain tomcat run (at least within eclipse)