Small fixes to enable pypi upload
Small fixes to enable pypi upload