Fix cut-and-paste errors from Tomcat module.