Python 2.5 compatibility fixes