Bunch of styleguide / lintian fixes