Tweaks on Player