Fix minor errors for #3371

Fix minor errors & typos for commits in request #3371.