Fixup mistakes

Fix the mistakes noted in PR #2597