More logging improvements.