small setup.py fixes
Merge pull request #5599 from ricardoquesada/setup_fixe

small setup.py fixes