Fix issues in the travis-ci build.