Updated the events so some are always logged.