Some changes for most recent version of tox