diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index e56b3f8363..dc99c5c974 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -2412,9 +2412,11 @@ RunScriptFileHandle (
   CONST CHAR16        *CurDir;
   UINTN               LineCount;
   CHAR16              LeString[50];
-  SHELL_STATUS        CalleeExitStatus = SHELL_SUCCESS;
+  SHELL_STATUS        CalleeExitStatus;
 
   ASSERT(!ShellCommandGetScriptExit());
+  
+  CalleeExitStatus = SHELL_SUCCESS;
 
   PreScriptEchoState = ShellCommandGetEchoState();
 
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index fe63e6a8d6..9260d9b021 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -1367,7 +1367,6 @@ EfiShellEnablePageBreak (
                             variables with the format 'x=y', where x is the
                             environment variable name and y is the value. If this
                             is NULL, then the current shell environment is used.
-  @param StatusCode         Points to the status code returned by the command.
 
   @param[out] ExitDataSize  ExitDataSize as returned from gBS->StartImage
   @param[out] ExitData      ExitData as returned from gBS->StartImage
diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h
index 4920d82830..ff123277c2 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.h
+++ b/ShellPkg/Application/Shell/ShellProtocol.h
@@ -446,8 +446,6 @@ EfiShellEnablePageBreak (
   @param[out] ExitDataSize  ExitDataSize as returned from gBS->StartImage
   @param[out] ExitData      ExitData as returned from gBS->StartImage
 
-  @param StatusCode         Points to the status code returned by the command.
-
   @retval EFI_SUCCESS       The command executed successfully. The  status code
                             returned by the command is pointed to by StatusCode.
   @retval EFI_INVALID_PARAMETER The parameters are invalid.
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 60b8c5b492..fa588ff7f4 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -295,7 +295,9 @@ PrintNonSfoHeader(
 /**
   print out the footer when not using standard format output.
 
-  @param[in] Path           String with starting path.
+  @param[in] Files            The number of files.
+  @param[in] Size             The size of files in bytes.
+  @param[in] Dirs             The number of directories.
 **/
 VOID
 EFIAPI