More fixes for travis builds