diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index a96d8d9..5038735 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1414,9 +1414,12 @@ u16 MobSAO::punch(content_t punch_item, v3f dir, const std::string &playername)
 
 
 		u16 amount = 2;
-		if (f.type == TT_SWORD || f.type == TT_SPEAR) {
+		if (f.type == TT_SWORD) {
 			amount = 4*((f.hardness/100)+1);
 			wear = 65535/f.hardness;
+		}else if (f.type == TT_SPEAR) {
+			amount = 2*((f.hardness/100)+1);
+			wear = 65535/f.hardness;
 		}else if (f.type == TT_AXE || f.type == TT_PICK) {
 			amount = ((f.hardness/200)+1);
 		}
diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 9497287..5e7d9f1 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -507,7 +507,7 @@ public:
 		}
 	}
 
-	bool loadSound(const std::string &name, const std::string &filepath, float gain=1.0)
+	bool loadSound(const std::string &name, const std::string &filepath, float gain)
 	{
 		std::string path = getPath("sound",filepath,true);
 		if (path == "")