Compatibility fixes for python 2.5