Fixes to setup.py