More python 3 related changes.