Misc fixes from current Debian packaging