Bug 20436: (QA follow up) - reference and typo fixes