More py3k fixes.
Automatic Py3k merge for testing