Small Fixes in EventProcessor