Assorted ruleset fixes

For user reported bugs.