Fixes to Logging.