More py2/3 compat fixes.