More py2/py3 fixes.