Remyfixes

Bug fixes to TCP/Rational