Minor changes on player