fix some rtp regressions