More Py3 conversion work
22 files changed