A couple of python 2.x fixes