Fix travis build bot and other changes