Cleanups suggested by debian maintainer