Fixes to the logging.