More logging updates for TFS