Fix to pass ruleset validation tests