diff --git a/src/FDM/YASim/Airplane.cpp b/src/FDM/YASim/Airplane.cpp
index ace15c92a..57c0d4fa9 100644
--- a/src/FDM/YASim/Airplane.cpp
+++ b/src/FDM/YASim/Airplane.cpp
@@ -599,8 +599,8 @@ void Airplane::compile()
       _cgDesiredAft = _wing->getMACx() - _wing->getMAC()*_cgDesiredMax;
       if (baseN != 0) {
         SGPropertyNode_ptr n = fgGetNode("/fdm/yasim/model", true);
-        n->getNode("cg-range-front", true)->setFloatValue(_cgDesiredFront);
-        n->getNode("cg-range-aft", true)->setFloatValue(_cgDesiredAft);
+        n->getNode("cg-x-range-front", true)->setFloatValue(_cgDesiredFront);
+        n->getNode("cg-x-range-aft", true)->setFloatValue(_cgDesiredAft);
       }
     }
     if (_tail)
diff --git a/src/FDM/YASim/Surface.cpp b/src/FDM/YASim/Surface.cpp
index 0b844d1f7..475c9ec90 100644
--- a/src/FDM/YASim/Surface.cpp
+++ b/src/FDM/YASim/Surface.cpp
@@ -36,7 +36,7 @@ Surface::Surface( Version * version ) :
     _inducedDrag = 1;
     _stallAlpha = 0;
     _alpha = 0;
-    _surfN = fgGetNode("/fdm/yasim/surfaces", true);
+    _surfN = fgGetNode("/fdm/yasim/debug/surfaces", true);
     if (_surfN != 0) {
       _surfN = _surfN->getChild("surface", _id, true);
       _fxN = _surfN->getNode("f-x", true);