Fixup after GH comments