More PyPI fixing...