More Py3K fixes