Fix bugs in Player