More python 3 work.