Fixing small issues in order to release to pypi