Make more adjustments and fixes for travis