Several modifications for setup.py