Fix/silence Lintian errors

Changes are similar to what we have in the 4.10 branch already.