Minor modifications to setup.py