Various patches as used in Debian.