Fix some spacing issues from PR #2689