More logging fixes.