Update setup to handle the shell mess better.