[tr2]: Minor changes