Minor setup.py updates