Small fixes for Python 2.4