more fixes for pypi