Fix travis issues