More Py3 compatibility fixes.