More travis build corrections