Some changes based on collective.cover setup.py