More setup.py improvements