Fixes for travis.