diff --git a/src/fru_device/fru_device.cpp b/src/fru_device/fru_device.cpp
index 9b13a2c..d508896 100644
--- a/src/fru_device/fru_device.cpp
+++ b/src/fru_device/fru_device.cpp
@@ -822,14 +822,15 @@
     {
         std::regex_replace(property.second.begin(), property.second.begin(),
                            property.second.end(), nonAsciiRegex, "_");
-        if (property.second.empty() && property.first != "PRODUCT_ASSET_TAG")
+        if (property.second.empty())
         {
             continue;
         }
         std::string key =
             std::regex_replace(property.first, nonAsciiRegex, "_");
 
-        if (property.first == "PRODUCT_ASSET_TAG")
+        // Allow FRU field update if ENABLE_FRU_UPDATE_PROPERTY is set.
+        if (isFieldEditable(property.first))
         {
             std::string propertyName = property.first;
             iface->register_property(
@@ -1307,7 +1308,7 @@
         (nextFRUAreaNewLoc - nextFRUAreaLoc) / fruBlockSize;
     // Append rest FRU Areas if size changed and there were other sections after
     // updated one
-    if (nextFRUAreaOffsetDiff && nextFRUAreaLoc)
+    if ((nextFRUAreaOffsetDiff != 0) && (nextFRUAreaLoc != 0U))
     {
         std::copy(restFRUAreasData.begin(), restFRUAreasData.end(),
                   fruData.begin() + nextFRUAreaNewLoc);