Fix some issues with Pypi