Typo fixes
Merge branch 'rr-feedbackfixes' into staging