Fixing some packaging issues with setup.py