Minor fixes regarding correct rule validation