Make some small changes to order of events.