updates for python 2.6