Further tweaks to setup.py