Gameplay fixes