More fixes for python 2.6 compatibility