Fixing Player bugs