A bit more jetty 9 fixes