diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index ac0f211294..3ad96c0cb6 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -491,8 +491,9 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
             // setLoadState(ERROR_MODEL + pModel->getStatus());
             setLoadState(
                 static_cast<LLModelLoader::eLoadState>(
-                            static_cast<S32>(ERROR_MODEL) + static_cast<S32>(mdl->getStatus())));
-            // </FS:Beq>            delete pModel;
+                            static_cast<S32>(ERROR_MODEL) + static_cast<S32>(pModel->getStatus())));
+            // </FS:Beq>
+            delete pModel;
             return;
         }
     }
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index e621f16a84..f72ad8cfbb 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1324,7 +1324,10 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type
     showWearablesListView();
 
     //e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE
-    applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
+    // <FS:Beq> More deprecated enum math
+    // applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
+    applyListViewFilter(static_cast<EListViewItemType>(static_cast<S32>(LVIT_SHAPE) + static_cast<S32>(type)));
+    // </FS:Beq>
     mWearableItemsList->setMenuWearableType(type);
 }