Fixes after tox testing