Clean up tomcat fixes per #12889