Fixed two more py3k issues.