Fixup from review issues from Issue #4