Changes to make it work on travis.