Fixes to change player and move