More py3 fixes.