Additional changes required to make Travis CI work.