More python 3 tweaks