Resolve further Lintian warnings