Minor fixes post-merge of RR.