Fixed issues with setup.py