MISC: More shell command updates