Minor fixes necessary to upload to PyPI