diff --git a/src/DE/DE_Wrapper.cxx b/src/DE/DE_Wrapper.cxx
index ca4ef5b6b9..c9f5b06517 100644
--- a/src/DE/DE_Wrapper.cxx
+++ b/src/DE/DE_Wrapper.cxx
@@ -27,7 +27,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(DE_Wrapper, Standard_Transient)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "global";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope ("global");
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : DE_Wrapper
@@ -253,7 +260,7 @@ Standard_Boolean DE_Wrapper::Load(const TCollection_AsciiString& theResource,
 Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theResource,
                                   const Standard_Boolean theIsRecursive)
 {
-  GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit", GlobalParameters.LengthUnit, THE_CONFIGURATION_SCOPE);
+  GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit", GlobalParameters.LengthUnit, THE_CONFIGURATION_SCOPE());
   if (theIsRecursive)
   {
     for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
@@ -326,7 +333,7 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
        aFormatIter.More(); aFormatIter.Next())
   {
     const TCollection_AsciiString& aFormat = aFormatIter.Key();
-    aResult += THE_CONFIGURATION_SCOPE + '.' + "priority" + '.' + aFormat + " :\t ";
+    aResult += THE_CONFIGURATION_SCOPE() + '.' + "priority" + '.' + aFormat + " :\t ";
     for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value());
          aVendorIter.More(); aVendorIter.Next())
     {
@@ -337,7 +344,7 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
   }
   aResult += "!Global parameters. Used for all providers\n";
   aResult += "!Length scale unit value. Should be more the 0. Default value: 1.0(MM)\n";
-  aResult += THE_CONFIGURATION_SCOPE + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n";
+  aResult += THE_CONFIGURATION_SCOPE() + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n";
   if (theIsRecursive)
   {
     for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
@@ -525,7 +532,7 @@ Standard_Boolean DE_Wrapper::findProvider(const TCollection_AsciiString& thePath
 //=======================================================================
 void DE_Wrapper::sort(const Handle(DE_ConfigurationContext)& theResource)
 {
-  const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE + '.' + "priority");
+  const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE() + '.' + "priority");
   NCollection_List<Handle(DE_ConfigurationNode)> aVendors;
   for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
        aFormatIter.More(); aFormatIter.Next())
diff --git a/src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx b/src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx
index 69856fd661..6a5234c1d3 100644
--- a/src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx
+++ b/src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx
@@ -19,7 +19,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(DEBRepCascade_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : DEBRepCascade_ConfigurationNode
@@ -48,7 +55,7 @@ DEBRepCascade_ConfigurationNode::DEBRepCascade_ConfigurationNode(const Handle(DE
 //=======================================================================
 bool DEBRepCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.WriteBinary =
     theResource->BooleanVal("write.binary", InternalParameters.WriteBinary, aScope);
@@ -72,7 +79,7 @@ TCollection_AsciiString DEBRepCascade_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Write parameters:\n";
diff --git a/src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx b/src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx
index 98edcd1388..e666a3c188 100644
--- a/src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx
+++ b/src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx
@@ -19,7 +19,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(DEXCAFCascade_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : DEXCAFCascade_ConfigurationNode
@@ -48,7 +55,7 @@ DEXCAFCascade_ConfigurationNode::DEXCAFCascade_ConfigurationNode(const Handle(DE
 //=======================================================================
 bool DEXCAFCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.ReadAppendMode = (PCDM_ReaderFilter::AppendMode)
     theResource->IntegerVal("read.append.mode", InternalParameters.ReadAppendMode, aScope);
@@ -67,7 +74,7 @@ TCollection_AsciiString DEXCAFCascade_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Read parameters:\n";
diff --git a/src/DRAWEXE/EXTERNLIB_STATIC b/src/DRAWEXE/EXTERNLIB_STATIC
index f99e4d4449..ca4c8fa4ee 100644
--- a/src/DRAWEXE/EXTERNLIB_STATIC
+++ b/src/DRAWEXE/EXTERNLIB_STATIC
@@ -7,6 +7,10 @@ TKOpenGlesTest
 TKViewerTest
 TKDraw
 TKMeshVS
+TKXDECascade
+TKTObj
+TKBinTObj
+TKXmlTObj
 TKXDESTEP
 TKSTEP
 TKSTEPAttr
@@ -18,6 +22,7 @@ TKXSBase
 TKVRML
 TKSTL
 TKRWMesh
+TKXDE
 TKBinXCAF
 TKXmlXCAF
 TKBin
diff --git a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx
index 59a02de833..51956d9db6 100644
--- a/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx
+++ b/src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx
@@ -19,7 +19,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(IGESCAFControl_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : IGESCAFControl_ConfigurationNode
@@ -48,7 +55,7 @@ IGESCAFControl_ConfigurationNode::IGESCAFControl_ConfigurationNode(const Handle(
 //=======================================================================
 bool IGESCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity)
     theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope);
@@ -129,7 +136,7 @@ TCollection_AsciiString IGESCAFControl_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Common parameters:\n";
diff --git a/src/OS/DataExchange.tcl b/src/OS/DataExchange.tcl
index 25c823990c..3f3b5badc7 100644
--- a/src/OS/DataExchange.tcl
+++ b/src/OS/DataExchange.tcl
@@ -15,10 +15,12 @@
 ;# Liste des toolkits WOK sous forme de full path
 ;# 
 proc DataExchange:toolkits { } {
-    return [list TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES \
-		TKXCAF TKXDEIGES TKXDESTEP \
-		TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh]
+  return [list TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES \
+               TKXCAF TKXDEIGES TKXDESTEP \
+               TKXDE TKXDECascade \
+               TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh]
 }
+
 ;#
 ;# Autres UDs a prendre.
 ;#
diff --git a/src/RWGltf/RWGltf_ConfigurationNode.cxx b/src/RWGltf/RWGltf_ConfigurationNode.cxx
index 65d85e4d84..ad42b0c958 100644
--- a/src/RWGltf/RWGltf_ConfigurationNode.cxx
+++ b/src/RWGltf/RWGltf_ConfigurationNode.cxx
@@ -18,7 +18,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(RWGltf_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : RWGltf_ConfigurationNode
@@ -47,7 +54,7 @@ RWGltf_ConfigurationNode::RWGltf_ConfigurationNode(const Handle(RWGltf_Configura
 //=======================================================================
 bool RWGltf_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.FileLengthUnit = 
     theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
@@ -114,7 +121,7 @@ TCollection_AsciiString RWGltf_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Common parameters:\n";
diff --git a/src/RWObj/RWObj_ConfigurationNode.cxx b/src/RWObj/RWObj_ConfigurationNode.cxx
index 5295802b3b..f860d800cf 100644
--- a/src/RWObj/RWObj_ConfigurationNode.cxx
+++ b/src/RWObj/RWObj_ConfigurationNode.cxx
@@ -18,7 +18,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(RWObj_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : RWObj_ConfigurationNode
@@ -47,7 +54,7 @@ RWObj_ConfigurationNode::RWObj_ConfigurationNode(const Handle(RWObj_Configuratio
 //=======================================================================
 bool RWObj_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
   InternalParameters.FileLengthUnit = 
     theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
   InternalParameters.SystemCS = (RWMesh_CoordinateSystem)
@@ -84,7 +91,7 @@ TCollection_AsciiString RWObj_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Common parameters:\n";
diff --git a/src/RWStl/RWStl_ConfigurationNode.cxx b/src/RWStl/RWStl_ConfigurationNode.cxx
index 7afe7cded2..edc4c13aad 100644
--- a/src/RWStl/RWStl_ConfigurationNode.cxx
+++ b/src/RWStl/RWStl_ConfigurationNode.cxx
@@ -19,7 +19,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(RWStl_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : STEPCAFControl_ConfigurationNode
@@ -48,7 +55,7 @@ RWStl_ConfigurationNode::RWStl_ConfigurationNode(const Handle(RWStl_Configuratio
 //=======================================================================
 bool RWStl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.ReadMergeAngle = 
     theResource->RealVal("read.merge.angle", InternalParameters.ReadMergeAngle, aScope);
@@ -68,7 +75,7 @@ TCollection_AsciiString RWStl_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Read parameters:\n";
diff --git a/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx b/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
index 42042d88ea..5405ec67bd 100644
--- a/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
@@ -19,7 +19,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : STEPCAFControl_ConfigurationNode
@@ -48,7 +55,7 @@ STEPCAFControl_ConfigurationNode::STEPCAFControl_ConfigurationNode(const Handle(
 //=======================================================================
 bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity)
     theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope);
@@ -157,7 +164,7 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Common parameters:\n";
diff --git a/src/SelectMgr/SelectMgr_Frustum.hxx b/src/SelectMgr/SelectMgr_Frustum.hxx
index 6299db613b..35f2147808 100644
--- a/src/SelectMgr/SelectMgr_Frustum.hxx
+++ b/src/SelectMgr/SelectMgr_Frustum.hxx
@@ -59,7 +59,7 @@ public:
   }
 
   //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
+  inline virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 protected:
 
diff --git a/src/TKRWMesh/EXTERNLIB b/src/TKRWMesh/EXTERNLIB
index 3807a923bc..23b9a92984 100644
--- a/src/TKRWMesh/EXTERNLIB
+++ b/src/TKRWMesh/EXTERNLIB
@@ -1,4 +1,3 @@
-TKBinXCAF
 TKernel
 TKMath
 TKMesh
@@ -7,6 +6,7 @@ TKLCAF
 TKV3d
 TKBRep
 TKG3d
+TKTopAlgo
 TKXDE
 TKService
 CSF_RapidJSON
diff --git a/src/TKSTL/EXTERNLIB b/src/TKSTL/EXTERNLIB
index d1d1380f02..8a5b1c21d1 100755
--- a/src/TKSTL/EXTERNLIB
+++ b/src/TKSTL/EXTERNLIB
@@ -1,4 +1,3 @@
-TKBinXCAF
 TKXDE
 TKernel
 TKMath
diff --git a/src/TKVRML/EXTERNLIB b/src/TKVRML/EXTERNLIB
index c2679194b5..b267b66d9d 100755
--- a/src/TKVRML/EXTERNLIB
+++ b/src/TKVRML/EXTERNLIB
@@ -1,4 +1,3 @@
-TKBinXCAF
 TKBRep
 TKXDE
 TKTopAlgo
diff --git a/src/TKXDECascade/EXTERNLIB b/src/TKXDECascade/EXTERNLIB
index 08343f97d7..f0c0f03911 100644
--- a/src/TKXDECascade/EXTERNLIB
+++ b/src/TKXDECascade/EXTERNLIB
@@ -2,6 +2,7 @@ TKBin
 TKBinL
 TKBinTObj
 TKBinXCAF
+TKBRep
 TKStd
 TKXml
 TKXmlL
@@ -9,4 +10,8 @@ TKXmlTObj
 TKXmlXCAF
 TKXDE
 TKernel
+TKMath
 TKLCAF
+TKXCAF
+TKStdL
+TKCDF
diff --git a/src/TKXDEIGES/EXTERNLIB b/src/TKXDEIGES/EXTERNLIB
index fd9f8dae93..d40184c29d 100755
--- a/src/TKXDEIGES/EXTERNLIB
+++ b/src/TKXDEIGES/EXTERNLIB
@@ -1,4 +1,3 @@
-TKBinXCAF
 TKBRep
 TKXDE
 TKernel
diff --git a/src/TKXDESTEP/EXTERNLIB b/src/TKXDESTEP/EXTERNLIB
index 9e3e191a18..547cb01bb2 100755
--- a/src/TKXDESTEP/EXTERNLIB
+++ b/src/TKXDESTEP/EXTERNLIB
@@ -1,4 +1,3 @@
-TKBinXCAF
 TKXDE
 TKBRep
 TKSTEPAttr
diff --git a/src/Vrml/Vrml_ConfigurationNode.cxx b/src/Vrml/Vrml_ConfigurationNode.cxx
index 1fafdb77fc..d04fcebc33 100644
--- a/src/Vrml/Vrml_ConfigurationNode.cxx
+++ b/src/Vrml/Vrml_ConfigurationNode.cxx
@@ -18,7 +18,14 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(Vrml_ConfigurationNode, DE_ConfigurationNode)
 
-static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider";
+namespace
+{
+  static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
+  {
+    static const TCollection_AsciiString aScope = "provider";
+    return aScope;
+  }
+}
 
 //=======================================================================
 // function : STEPCAFControl_ConfigurationNode
@@ -47,7 +54,7 @@ Vrml_ConfigurationNode::Vrml_ConfigurationNode(const Handle(Vrml_ConfigurationNo
 //=======================================================================
 bool Vrml_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
 {
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor();
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
   InternalParameters.WriterVersion = (WriteMode_WriterVersion)
     theResource->IntegerVal("writer.version", InternalParameters.WriterVersion, aScope);
@@ -66,7 +73,7 @@ TCollection_AsciiString Vrml_ConfigurationNode::Save() const
   TCollection_AsciiString aResult;
   aResult += "!*****************************************************************************\n";
   aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
-  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + ".";
+  TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
 
   aResult += "!\n";
   aResult += "!Write parameters:\n";