Adjustments for Python 2.4