More changes to fix travis-ci build