Fix python 2.5 compatibility issues