Getting close to fixing things for Travis CI.