Changed how buffered events work.