Backport fixes ported from g-k-d from !128

I’m running into the issues that were fixed in !128 (merged) in Debian Bookworm, so I thought I’d create a quick MR to backport them.