More fixes for Travis build