Add some changes for Travis