Fix travis build errors...