Fix a lot of Py3 failures.