Some python2.6 compatibility tweaks.