RTP, ALF + minor changes here and there