+ Fixes from or suggested by Bernd Eckenfels, the Debian maintainer: