Some more py2.6 fixes.