corrected imports after tomcat enhancements