More fixes to get proper remy tracing for TCP/Rational working