More tweaks to setup.py