Couple fixes to rmt connections