Made a couple changes related to the comments in PR 1725