diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index fece18d20c2..14bce06e3b3 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1349,7 +1349,8 @@ namespace MWPhysics
                 else if (physicActor->getCollisionMode() && canMoveToWaterSurface(iter->first, waterlevel))
                 {
                     const osg::Vec3f actorPosition = physicActor->getPosition();
-                    physicActor->setPosition(osg::Vec3f(actorPosition.x(), actorPosition.y(), waterlevel));            
+                    physicActor->setPosition(osg::Vec3f(actorPosition.x(), actorPosition.y(), waterlevel));
+                    waterCollision = true;
                 }
             }
             physicActor->setCanWaterWalk(waterCollision);
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index a095d5dd42f..36a0f4085a2 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -110,8 +110,6 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename);
     mResourceSystem->getSceneManager()->notifyAttached(attached);
-    if (mSkeleton)
-        mSkeleton->markDirty();
 
     scene.reset(new PartHolder(attached));
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d9dd1a89eb2..53eaf0996da 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -671,8 +671,6 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
 {
     osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename);
-    if (mSkeleton)
-        mSkeleton->markDirty();
     mResourceSystem->getSceneManager()->notifyAttached(attached);
     if (enchantedGlow)
         addGlow(attached, *glowColor);
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 390a8e82356..f3c2aef77e7 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -148,6 +148,8 @@ void Skeleton::markDirty()
 {
     mTraversedEvenFrame = false;
     mTraversedOddFrame = false;
+    mBoneCache.clear();
+    mBoneCacheInit = false;
 }
 
 void Skeleton::traverse(osg::NodeVisitor& nv)
@@ -160,6 +162,16 @@ void Skeleton::traverse(osg::NodeVisitor& nv)
     osg::Group::traverse(nv);
 }
 
+void Skeleton::childInserted(unsigned int)
+{
+    markDirty();
+}
+
+void Skeleton::childRemoved(unsigned int, unsigned int)
+{
+    markDirty();
+}
+
 Bone::Bone()
     : mNode(NULL)
 {
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 764b7f64595..24dcc6b3f4d 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -53,10 +53,12 @@ namespace SceneUtil
 
         bool getActive() const;
 
-        /// If a new RigGeometry is added after the Skeleton has already been rendered, you must call markDirty().
+        void traverse(osg::NodeVisitor& nv);
+
         void markDirty();
 
-        void traverse(osg::NodeVisitor& nv);
+        virtual void childInserted(unsigned int);
+        virtual void childRemoved(unsigned int, unsigned int);
 
     private:
         // The root bone is not a "real" bone, it has no corresponding node in the scene graph.