Fixes for python2.6 and 3.x