More Py3 fixes.