Fixes for using jetty 9.1.3