Fix travis build errors