Changes to support Travis