Polishing. Make sure sample runs on Tomcat 8