More python 3 compatibility fixes