Some changes for python