Assorted ruleset fixes

For user reported bugs.
Please link issues with a full URL.