More Py2.6 compatibility