A few fixes to make tox and Jenkins happy