Fix setup.py issues