Fix Electrix/Misty-Terrain + Yawn