#9: Gameplay Stability Fixes