More Travis/tox fixes.