Still yet more fixes for travis ci