Changes to support Travis CI