Fixup - updated based on PR comments.