Cut-down to tomcat QCL + fixes