more fixes for rules