Minor updates and fixes to EventProcessor and Listeners.