Fixup some more PR reports