Fine tuning for setup.py and manifest