more python 2.6.x fixes