Fix travis ci build issues