More setup.py fixes