Few more fixes for rules and events