Try and fix Travis failures