Responding to feedback from upstream maintainer