Fixes per upstream maintainer guidance for PR