Couple of fixes relating to setup.py