More PyPI fixing