Fix diagonal rulesets
Fix stack trace dump on unknown wand template