Fixes required for pypi