More changes to setup.py