More logging improvements