diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index 10ce33eee9..fed38564e9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -929,7 +929,7 @@ BcfgAddOptDebug1(
   //
   ASSERT(FileName == NULL || Data == NULL);
 
-  if (ShellStatus == SHELL_SUCCESS && FileName != NULL || Data != NULL) {
+  if (ShellStatus == SHELL_SUCCESS && (FileName != NULL || Data != NULL)) {
     if (FileName != NULL) {
       //
       // Open the file and populate the data buffer.
@@ -948,7 +948,7 @@ BcfgAddOptDebug1(
         ShellStatus = SHELL_OUT_OF_RESOURCES;
       }
       if (ShellStatus == SHELL_SUCCESS) {
-        ShellStatus = ShellReadFile(FileHandle, &(UINTN)Intermediate, Data);
+        ShellStatus = ShellReadFile(FileHandle, &((UINTN)Intermediate), Data);
       }
     } else {
       Intermediate = StrSize(Data);
diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
index 1713d3bafc..81d738964e 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
@@ -929,7 +929,7 @@ BcfgAddOptInstall1(
   //
   ASSERT(FileName == NULL || Data == NULL);
 
-  if (ShellStatus == SHELL_SUCCESS && FileName != NULL || Data != NULL) {
+  if (ShellStatus == SHELL_SUCCESS && (FileName != NULL || Data != NULL)) {
     if (FileName != NULL) {
       //
       // Open the file and populate the data buffer.
@@ -948,7 +948,7 @@ BcfgAddOptInstall1(
         ShellStatus = SHELL_OUT_OF_RESOURCES;
       }
       if (ShellStatus == SHELL_SUCCESS) {
-        ShellStatus = ShellReadFile(FileHandle, &(UINTN)Intermediate, Data);
+        ShellStatus = ShellReadFile(FileHandle, &((UINTN)Intermediate), Data);
       }
     } else {
       Intermediate = StrSize(Data);