Clean up player bugs