More travis build fixes