Fixes for pypi