Updates due to the changes to the event dispatcher.