diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h
index 0b541379e4e..b5683c0d70f 100644
--- a/ReactCommon/fabric/components/view/conversions.h
+++ b/ReactCommon/fabric/components/view/conversions.h
@@ -14,6 +14,7 @@
 #include <folly/dynamic.h>
 #include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
+#include <cmath>
 
 namespace facebook {
 namespace react {
@@ -51,7 +52,7 @@ inline YGFloatOptional yogaOptionalFloatFromFloat(Float value) {
 }
 
 inline YGValue yogaStyleValueFromFloat(const Float &value) {
-  if (isnan(value) || value == kFloatUndefined) {
+  if (std::isnan(value) || value == kFloatUndefined) {
     return YGValueUndefined;
   }
 
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
index a419be119cf..50d57a0e686 100644
--- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
+++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
@@ -28,6 +28,8 @@ struct LayoutContext;
  */
 class LayoutableShadowNode : public virtual Sealable {
  public:
+  virtual ~LayoutableShadowNode() noexcept = default;
+
   /*
    * Measures the node (and node content, propbably recursivly) with
    * given constrains and relying on possible layout.