diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index b7d1c15b8..78186c439 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1130,8 +1130,6 @@ namespace NifOsg
                 triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
             }
 
-            geometry->setName(triShape->name);
-
             if (geometry->getDataVariance() == osg::Object::DYNAMIC)
             {
                 // Add a copy, we will alternate between the two copies every other frame using the FrameSwitch
@@ -1221,7 +1219,6 @@ namespace NifOsg
 
             osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
             rig->setSourceGeometry(geometry);
-            rig->setName(triShape->name);
 
             const Nif::NiSkinInstance *skin = triShape->skin.getPtr();
 
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 8634a4df6..1385f771e 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -32,29 +32,29 @@ namespace SceneUtil
 
         virtual void apply(osg::MatrixTransform& node)
         {
-            traverse(node);
+            applyNode(node);
+        }
+        virtual void apply(osg::Geometry& node)
+        {
+            applyNode(node);
         }
         virtual void apply(osg::Node& node)
         {
-            traverse(node);
+            applyNode(node);
         }
         virtual void apply(osg::Group& node)
         {
-            traverse(node);
+            applyNode(node);
         }
 
-        virtual void apply(osg::Geometry& geom)
+        void applyNode(osg::Node& node)
         {
-            std::string lowerName = Misc::StringUtils::lowerCase(geom.getName());
+            std::string lowerName = Misc::StringUtils::lowerCase(node.getName());
             if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
                     || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
-            {
-                osg::Node* node = &geom;
-                while (node && node->getNumParents() && !node->getStateSet())
-                    node = node->getParent(0);
-                if (node)
-                    mToCopy.push_back(node);
-            }
+                mToCopy.push_back(&node);
+            else
+                traverse(node);
         }
 
         void doCopy()