Minor setup.py fixes