Fix travis build errors
Fix github/travis issues