python 2.5 fixes