Python 2.5.x fixes