fixed a few more PyPI related issues