UP-4223:  A few small updates based on feedback from the pull request