Applied fixes based on comments from the OTHER pull request.

Thanks for the direction on this.