BLD Minor setup.py fixes