Fixes to the setup.py script