More logging changes