Fix encoding errors
Update to Py3k