Pypi installation fixes