Small TR fixes.