various cleanups proposed by debian folks