More python2 and 3 compatability refinements