Fix (mostly Debian) build breakage