More setup.py update