Setup.py issues corrected