Minor fixes to setup.py