diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 35b3c4546..f903144b6 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -604,17 +604,17 @@ namespace MWClass
         return isFlagBitSet(ptr, ESM::Creature::Bipedal);
     }
 
-    bool Creature::canFly(const MWWorld::Ptr &ptr) const
+    bool Creature::canFly(const MWWorld::ConstPtr &ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Flies);
     }
 
-    bool Creature::canSwim(const MWWorld::Ptr &ptr) const
+    bool Creature::canSwim(const MWWorld::ConstPtr &ptr) const
     {
         return isFlagBitSet(ptr, static_cast<ESM::Creature::Flags>(ESM::Creature::Swims | ESM::Creature::Bipedal));
     }
 
-    bool Creature::canWalk(const MWWorld::Ptr &ptr) const
+    bool Creature::canWalk(const MWWorld::ConstPtr &ptr) const
     {
         return isFlagBitSet(ptr, static_cast<ESM::Creature::Flags>(ESM::Creature::Walks | ESM::Creature::Bipedal));
     }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index fb303278f..5f110e918 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -108,9 +108,9 @@ namespace MWClass
             }
 
             virtual bool isBipedal (const MWWorld::ConstPtr &ptr) const;
-            virtual bool canFly (const MWWorld::Ptr &ptr) const;
-            virtual bool canSwim (const MWWorld::Ptr &ptr) const;
-            virtual bool canWalk (const MWWorld::Ptr &ptr) const;
+            virtual bool canFly (const MWWorld::ConstPtr &ptr) const;
+            virtual bool canSwim (const MWWorld::ConstPtr &ptr) const;
+            virtual bool canWalk (const MWWorld::ConstPtr &ptr) const;
 
             virtual int getSkill(const MWWorld::Ptr &ptr, int skill) const;
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 681b72c5b..8722187ab 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -360,17 +360,17 @@ namespace MWWorld
         return false;
     }
 
-    bool Class::canFly(const Ptr &ptr) const
+    bool Class::canFly(const ConstPtr &ptr) const
     {
         return false;
     }
 
-    bool Class::canSwim(const Ptr &ptr) const
+    bool Class::canSwim(const ConstPtr &ptr) const
     {
         return false;
     }
 
-    bool Class::canWalk(const Ptr &ptr) const
+    bool Class::canWalk(const ConstPtr &ptr) const
     {
         return false;
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index cc84f9b32..619508f74 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -301,9 +301,9 @@ namespace MWWorld
             }
 
             virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
-            virtual bool canFly(const MWWorld::Ptr& ptr) const;
-            virtual bool canSwim(const MWWorld::Ptr& ptr) const;
-            virtual bool canWalk(const MWWorld::Ptr& ptr) const;
+            virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
+            virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
+            virtual bool canWalk(const MWWorld::ConstPtr& ptr) const;
             bool isPureWaterCreature(const MWWorld::Ptr& ptr) const;
             bool isMobile(const MWWorld::Ptr& ptr) const;