Fix some problems with Wrench CLI.