RR and SRF implementation errors fixed