Fixups after merge.

Add missing dependencies.
Change argv on some utilities.
4 files changed