Index: Application/Shell/ShellProtocol.c
===================================================================
--- Application/Shell/ShellProtocol.c	(revision 15783)
+++ Application/Shell/ShellProtocol.c	(working copy)
@@ -2054,7 +2054,7 @@
   }
   SHELL_FREE_NON_NULL(BasePath);
   return(Status);
-  }
+}
 
 /**
   Get the GUID value from a human readable name.
@@ -2586,8 +2586,8 @@
                                 multiple environment variables are being returned, Attributes
                                 is undefined.
 
-  @retval NULL                  The environment variable doesn’t exist.
-  @return                       A non-NULL value points to the variable’s value. The returned
+  @retval NULL                  The environment variable doesn't exist.
+  @return                       A non-NULL value points to the variable's value. The returned
                                 pointer does not need to be freed by the caller.
 **/
 CONST CHAR16 *
Index: Include/Protocol/EfiShell.h
===================================================================
--- Include/Protocol/EfiShell.h	(revision 15783)
+++ Include/Protocol/EfiShell.h	(working copy)
@@ -431,8 +431,8 @@
                                 multiple environment variables are being returned, Attributes
                                 is undefined.
 
-  @retval NULL                  The environment variable doesn’t exist.  
-  @return                       The environment variable’s value. The returned pointer does not 
+  @retval NULL                  The environment variable doesn't exist.  
+  @return                       The environment variable's value. The returned pointer does not 
                                 need to be freed by the caller.  
 **/
 typedef
Index: Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
--- Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(revision 15783)
+++ Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(working copy)
@@ -820,8 +820,8 @@
 Function to add a new GUID/Name mapping.
 
 @param[in] Guid       The Guid
-@param[in] NameId     The STRING id of the HII string to use
-@param[in] Dump       The pointer to the dump function
+@param[in] NameID     The STRING id of the HII string to use
+@param[in] DumpFunc   The pointer to the dump function
 
 
 @retval EFI_SUCCESS           The operation was sucessful
Index: Library/UefiShellCommandLib/UefiShellCommandLib.c
===================================================================
--- Library/UefiShellCommandLib/UefiShellCommandLib.c	(revision 15783)
+++ Library/UefiShellCommandLib/UefiShellCommandLib.c	(working copy)
@@ -215,7 +215,7 @@
 }
 
 /**
-  Find a dynamic command protocol instance given a command name string
+  Find a dynamic command protocol instance given a command name string.
 
   @param CommandString  the command name string
 
@@ -277,7 +277,7 @@
   IN CONST CHAR16 *CommandString
   )
 {
-  return (ShellCommandFindDynamicCommand(CommandString) != NULL);
+  return (BOOLEAN) ((ShellCommandFindDynamicCommand(CommandString) != NULL));
 }
 
 /**
Index: Library/UefiShellLevel3CommandsLib/Help.c
===================================================================
--- Library/UefiShellLevel3CommandsLib/Help.c	(revision 15783)
+++ Library/UefiShellLevel3CommandsLib/Help.c	(working copy)
@@ -35,11 +35,15 @@
   )
 {
   EFI_STATUS                          Status;
-  BOOLEAN                             Found = FALSE;
-  EFI_HANDLE                          *CommandHandleList = NULL;
+  BOOLEAN                             Found;
+  EFI_HANDLE                          *CommandHandleList;
   EFI_HANDLE                          *NextCommand;
   EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *DynamicCommand;
-  CHAR16                              *OutText = NULL;
+  CHAR16                              *OutText;
+  
+  Found = FALSE;
+  CommandHandleList = NULL;
+  OutText = NULL;
 
   CommandHandleList = GetHandleListByProtocol(&gEfiShellDynamicCommandProtocolGuid);