more Py3k fixes