Fixes after running Lintian with pedant option