Further  RTP bug fixes