Fixes to the new Event Aggregator/Mediator sections