Fixed travis issues