python2.6 support fixes