PR Fixup: address comments