Fix all the rules with properties