Changes to get working with Travis CI