Fixes to allow upload to pypi