More rulset fixes

More assorted ruleset fixes.