Fixes to work on travis.