A few more Py2.5 fixes.