Fix PyPI install problems