Merge "Small Fixes in EventProcessor"