Some updates to the logging behavior.