PyPI Package fixes