Py3k fixes .... again.