Misc fixes from Debian

As promised, three simple patches that came up from my Debianization efforts.