More fixes to the setup.py