Fixes for No Guard, Gastro Acid, Klutz, Embargo and Magic Room