Fixing some travis issues