Python3.x fixes.