diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 2a007d6ad..a90a53adb 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -82,12 +82,12 @@ namespace MWClass
         registerClass (typeid (ESM::Apparatus).name(), instance);
     }
 
-    std::string Apparatus::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Apparatus::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Apparatus Up");
     }
 
-    std::string Apparatus::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Apparatus::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Apparatus Down");
     }
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 240bf8dea..e50a57c6a 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -45,10 +45,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index a10ad8da7..500664b36 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -177,7 +177,7 @@ namespace MWClass
         registerClass (typeid (ESM::Armor).name(), instance);
     }
 
-    std::string Armor::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Armor::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         int es = getEquipmentSkill(ptr);
         if (es == ESM::Skill::LightArmor)
@@ -188,7 +188,7 @@ namespace MWClass
             return std::string("Item Armor Heavy Up");
     }
 
-    std::string Armor::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Armor::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         int es = getEquipmentSkill(ptr);
         if (es == ESM::Skill::LightArmor)
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 270a36bf4..8ddd92e4d 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -58,10 +58,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 372dc084f..25be08587 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -96,12 +96,12 @@ namespace MWClass
         registerClass (typeid (ESM::Book).name(), instance);
     }
 
-    std::string Book::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Book::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Book Up");
     }
 
-    std::string Book::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Book::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Book Down");
     }
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 0452dd6f1..a0b5b434e 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -42,10 +42,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 85c2fd1ba..bf3b90941 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -133,10 +133,9 @@ namespace MWClass
         registerClass (typeid (ESM::Clothing).name(), instance);
     }
 
-    std::string Clothing::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Clothing::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
-         MWWorld::LiveCellRef<ESM::Clothing> *ref =
-            ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
 
         if (ref->mBase->mData.mType == 8)
         {
@@ -145,10 +144,9 @@ namespace MWClass
         return std::string("Item Clothes Up");
     }
 
-    std::string Clothing::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Clothing::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
-         MWWorld::LiveCellRef<ESM::Clothing> *ref =
-            ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
 
         if (ref->mBase->mData.mType == 8)
         {
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 799c7d688..e513613e4 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -50,10 +50,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 67d85458d..bdc67b452 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -98,12 +98,12 @@ namespace MWClass
         registerClass (typeid (ESM::Ingredient).name(), instance);
     }
 
-    std::string Ingredient::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Ingredient::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Ingredient Up");
     }
 
-    std::string Ingredient::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Ingredient::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Ingredient Down");
     }
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 46695e52d..96fc7e8e4 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -46,10 +46,10 @@ namespace MWClass
             
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index bc07d905b..c45b11467 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -126,12 +126,12 @@ namespace MWClass
         registerClass (typeid (ESM::Light).name(), instance);
     }
 
-    std::string Light::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Light::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Misc Up");
     }
 
-    std::string Light::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Light::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Misc Down");
     }
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 7ee5d1d47..02e327587 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -46,10 +46,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index c9410dd0b..b46159cbc 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -92,12 +92,12 @@ namespace MWClass
         registerClass (typeid (ESM::Lockpick).name(), instance);
     }
 
-    std::string Lockpick::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Lockpick::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Lockpick Up");
     }
 
-    std::string Lockpick::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Lockpick::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Lockpick Down");
     }
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index 5a8579e35..b5b4844c3 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -46,10 +46,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 8dad332b6..c8fdc2a8a 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -106,14 +106,14 @@ namespace MWClass
         registerClass (typeid (ESM::Miscellaneous).name(), instance);
     }
 
-    std::string Miscellaneous::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Miscellaneous::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         if (isGold(ptr))
             return std::string("Item Gold Up");
         return std::string("Item Misc Up");
     }
 
-    std::string Miscellaneous::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Miscellaneous::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         if (isGold(ptr))
             return std::string("Item Gold Down");
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 64e7c6e6d..679319e02 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -42,10 +42,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 24f7aae2d..e4928384d 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -87,12 +87,12 @@ namespace MWClass
         registerClass (typeid (ESM::Potion).name(), instance);
     }
 
-    std::string Potion::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Potion::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Potion Up");
     }
 
-    std::string Potion::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Potion::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Potion Down");
     }
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index a0c4b97df..ac6e0d180 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -45,10 +45,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 5973e407c..ac9ac56e8 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -92,12 +92,12 @@ namespace MWClass
         registerClass (typeid (ESM::Probe).name(), instance);
     }
 
-    std::string Probe::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Probe::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Probe Up");
     }
 
-    std::string Probe::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Probe::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Probe Down");
     }
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index b7252f61d..d0a4b4947 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -46,10 +46,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index bf3ebda89..1940baa67 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -83,12 +83,12 @@ namespace MWClass
         registerClass (typeid (ESM::Repair).name(), instance);
     }
 
-    std::string Repair::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Repair::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Repair Up");
     }
 
-    std::string Repair::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Repair::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Repair Down");
     }
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 8264ae092..dce47167f 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -42,10 +42,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 299a79781..db1448afc 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -153,10 +153,9 @@ namespace MWClass
         registerClass (typeid (ESM::Weapon).name(), instance);
     }
 
-    std::string Weapon::getUpSoundId (const MWWorld::Ptr& ptr) const
+    std::string Weapon::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
-        MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
 
         int type = ref->mBase->mData.mType;
         // Ammo
@@ -198,10 +197,9 @@ namespace MWClass
         return std::string("Item Misc Up");
     }
 
-    std::string Weapon::getDownSoundId (const MWWorld::Ptr& ptr) const
+    std::string Weapon::getDownSoundId (const MWWorld::ConstPtr& ptr) const
     {
-        MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
 
         int type = ref->mBase->mData.mType;
         // Ammo
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 273f8ba18..611e2edf0 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -56,10 +56,10 @@ namespace MWClass
 
             static void registerSelf();
 
-            virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the pick up sound Id
 
-            virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
+            virtual std::string getDownSoundId (const MWWorld::ConstPtr& ptr) const;
             ///< Return the put down sound Id
 
             virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 5f88f241a..653163a4c 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -252,12 +252,12 @@ namespace MWWorld
         sClasses.insert(std::make_pair(key, instance));
     }
 
-    std::string Class::getUpSoundId (const Ptr& ptr) const
+    std::string Class::getUpSoundId (const ConstPtr& ptr) const
     {
         throw std::runtime_error ("class does not have an up sound");
     }
 
-    std::string Class::getDownSoundId (const Ptr& ptr) const
+    std::string Class::getDownSoundId (const ConstPtr& ptr) const
     {
         throw std::runtime_error ("class does not have an down sound");
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 17ab13fbb..56dc7ede5 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -234,11 +234,11 @@ namespace MWWorld
             ///
             /// (default implementation: return false)
 
-            virtual std::string getUpSoundId (const Ptr& ptr) const;
+            virtual std::string getUpSoundId (const ConstPtr& ptr) const;
             ///< Return the up sound ID of \a ptr or throw an exception, if class does not support ID retrieval
             /// (default implementation: throw an exception)
 
-            virtual std::string getDownSoundId (const Ptr& ptr) const;
+            virtual std::string getDownSoundId (const ConstPtr& ptr) const;
             ///< Return the down sound ID of \a ptr or throw an exception, if class does not support ID retrieval
             /// (default implementation: throw an exception)