Pypi fixes