more python2.6 fixes