PyPI install fixes