Fix a couple of build-breakages on Debian.