Some other fixes for travis