Various improvements to support desired tomcat6.stl