pre-Py3k fixes