Fix events for org delete