Minor changes to shell.c and shell.h