apply fixes from RT#86347 (spelling)