A couple changes required for releasing to pypi