[CLC-506] More logging tinkering