small fixes to rr implementation