Python 2.4 fixes for modules