Minor changes in player