rc: improvements for cbr