More Py26 compatibility fixes