Bug fixes for diff event producer