Fixed more ruleset bugs