More fixes for travis-ci