More fixes to deal with different python installations