Tweaks to setup.py