Solve travis issues