More python2 updates