more py2.6 compat fixes