Corrections for python 2.5 & 2.6