More python2.6 fixes