Fixes for TCAgent and TCLRS