Fixes and workarounds for Jetty 9.