Compatabilty changes for python 2.4