Minor fixes in cmdline + output