Style / lintian fixes

Force of habit. :)