More fixes for python 3.x.