More Event Processor fixes.