Fixing some of the shell commands