Event Scheduler fixes.