A few improvements to the logging.