More python 3 fixes