Fix quoting for Tomcat only