Add fixes to setup.py