some cleanups and lintian bickering