Fixes to setup.py / Manifest