Edits and additions to satisfy lintian.