Fixes from Debian