More tweaks for travis building.