Minor modifications to the logging.