Fixing minor setup.py problems