Gameplay bug fixes