Setup.py improvements