Changes to fix Travis CI integration.