RR fixes