Style / lintian fixes