Improved support for python 2.6