More fixes for Travis-ci.