Fixes for Python 2.5.