Fixed somethings to work on PyPI