More python 3 compatability.