Improve the logging.