Fixed handling of events and aggregates