More Py3k fixes