Cmd output tweaks