Fix issues found in review of PR #1422