More fixes for python