Fixed setup.py issues