Minor py3.x fixes.