Minor changes to player