Further tweaks for travis and jetty