Some fixing for publishing on PyPI