Even more fixes to rule logic