diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 9bb6ab58f..4b5cc3015 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -55,8 +55,6 @@
 #include <DelayImp.h>
 #pragma comment(lib, "delayimp.lib")
 
-static bool sVerboseDebugging = false;
-
 bool attemptDelayLoad()
 {
 	__try
@@ -72,6 +70,8 @@ bool attemptDelayLoad()
 }
 #endif
 
+static bool sVerboseDebugging = false;
+
 FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels);
 
 FMOD::ChannelGroup *LLAudioEngine_FMODEX::mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT] = {0};
@@ -171,7 +171,7 @@ public:
 				llcont << llendl;
 			}
 			mDeadSounds.insert(sound);
-			mActiveSounds.erase(it);
+			mActiveSounds.erase(sound);
 		}
 	}
 	void addNewChannelToSound(FMOD::Sound* sound,FMOD::Channel* channel)
@@ -206,7 +206,7 @@ public:
 				it2->second.erase(channel);
 			}
 			mDeadChannels.insert(*it);
-			mActiveChannels.erase(it);
+			mActiveChannels.erase(channel);
 		}
 	}
 } gSoundCheck;
diff --git a/indra/newview/llfloaterobjectiminfo.cpp b/indra/newview/llfloaterobjectiminfo.cpp
index f2b2049a4..101f45bf5 100644
--- a/indra/newview/llfloaterobjectiminfo.cpp
+++ b/indra/newview/llfloaterobjectiminfo.cpp
@@ -56,30 +56,6 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // LLFloaterObjectIMInfo
-class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
-{
-public:
-	LLFloaterObjectIMInfo(const LLSD& sd);
-	virtual ~LLFloaterObjectIMInfo() { };
-
-	BOOL postBuild(void);
-
-	void update(LLSD& payload);
-
-	// UI Handlers
-	static void onClickMap(void* data);
-	static void onClickOwner(void* data);
-	static void onClickMute(void* data);
-
-	void nameCallback(const LLUUID& id, const std::string& full_name, bool is_group);
-
-private:
-	LLUUID mObjectID;
-	LLUUID mOwnerID;
-	std::string mSLurl;
-	std::string mName;
-	bool mGroupOwned;
-};
 
 LLFloaterObjectIMInfo::LLFloaterObjectIMInfo(const LLSD& seed)
 : mObjectID(), mName(), mSLurl(), mOwnerID(), mGroupOwned(false)
diff --git a/indra/newview/llfloaterobjectiminfo.h b/indra/newview/llfloaterobjectiminfo.h
index 55f8bba6f..58377c009 100644
--- a/indra/newview/llfloaterobjectiminfo.h
+++ b/indra/newview/llfloaterobjectiminfo.h
@@ -33,14 +33,31 @@
 #ifndef LL_LLFLOATEROBJECTIMINFO_H
 #define LL_LLFLOATEROBJECTIMINFO_H
 
-namespace LLObjectIMInfo
+#include "llfloater.h"
+
+class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
 {
-	// Show an LLFloaterObjectIMInfo for this object.
-	static void show(const LLUUID& object_id, 
-						const std::string& name, 
-						const std::string& location, 
-						const LLUUID& owner_id, 
-						bool owner_is_group);
+public:
+	LLFloaterObjectIMInfo(const LLSD& sd);
+	virtual ~LLFloaterObjectIMInfo() { };
+
+	/*virtual*/ BOOL postBuild(void);
+
+	void update(LLSD& payload);
+
+	// UI Handlers
+	static void onClickMap(void* data);
+	static void onClickOwner(void* data);
+	static void onClickMute(void* data);
+
+	void nameCallback(const LLUUID& id, const std::string& full_name, bool is_group);
+
+private:
+	LLUUID mObjectID;
+	LLUUID mOwnerID;
+	std::string mSLurl;
+	std::string mName;
+	bool mGroupOwned;
 };
 
 #endif // LL_LLFLOATERURLDISPLAY_H