More logging enhancement.