Fixed issues while running the shell