Update setup.py

More fixes