More py3k fixes.