Some small cleanups to make lintian happy / part 1