Fix some travis issues