more py3k fixes