Fixed issues wrt starting the shell.