Few changes in python mode