Fixed issues with setup.py not properly installing