Further improvements to setup.py