Fixes for logging.