diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 6c97a64ed7080d9284f207d7b4931857b4a4ac68..7768c3da0c112e346abe0298d5229b523cbd41e9 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -690,7 +690,7 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
 	return FALSE;
 }
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN
 // HACK: to fool the compiler into not emitting unused warnings.
 namespace {
 	const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, 
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 892e144911b7f62a29fde66d3356c5ae89c4ecee..115bf475532fa8f12720da5dcf6e9cded9fa7fad 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -234,7 +234,7 @@ class LL_COMMON_API LLThreadSafeRefCount
 public:
 	LLThreadSafeRefCount();
 	LLThreadSafeRefCount(const LLThreadSafeRefCount&);
-	LLThreadSafeRefCount&operator=(const LLThreadSafeRefCount& ref) 
+	LLThreadSafeRefCount& operator=(const LLThreadSafeRefCount& ref) 
 	{
 		if (sMutex)
 		{
@@ -245,6 +245,7 @@ class LL_COMMON_API LLThreadSafeRefCount
 		{
 			sMutex->unlock();
 		}
+		return *this;
 	}