Fixed setup.py and related files