Changes in event firing and buffer clearing