Another py3k fixes