Add some more Python3 fixes.