Some fixes to the Pypi packaging.