Updates for setup.py