Some changes to tox service