A few minor changes to the shell utility.