Various changes to setup.py