Fix fuzz in distro patches caused upstream changes
4 files changed