More Ruleset validations.
Fixes after finishing testing