diff --git a/doc/contributions.txt b/doc/contributions.txt
index c8125c675fbfa6e1448b8005b23668d019c7bb7a..f7dada053be09207533abc6284dc8d0a590c7d3c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -518,6 +518,9 @@ Robin Cornelius
 	SNOW-108
 	SNOW-204
 	SNOW-484
+	SNOW-506
+	SNOW-514
+	SNOW-585
 	VWR-2488
 	VWR-9557
 	VWR-11128
@@ -616,6 +619,7 @@ Tharax Ferraris
 	VWR-605
 Thickbrick Sleaford
 	SNOW-207
+	SNOW-743
 	VWR-7109
 	VWR-9287
 	VWR-13483
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
index 62586dd92f105be9821c74174f9ca2d4b1d49e4b..7f42623d017eff2dfc54487f3457f0c38b5d8566 100644
--- a/indra/llcommon/lleventtimer.h
+++ b/indra/llcommon/lleventtimer.h
@@ -33,7 +33,7 @@
 #include "lltimer.h"
 
 // class for scheduling a function to be called at a given frequency (approximate, inprecise)
-class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer>
+class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer>
 {
 public:
 	LLEventTimer(F32 period);	// period is the amount of time between each call to tick() in seconds
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 268d16976f44c530978fcbf8440d22c95fea6e38..981e3df16b25f3c4a9e3fb103eb4d6af0f6169ef 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -33,7 +33,7 @@
 
 
 class LLNameListCtrl
-:	public LLScrollListCtrl, protected LLInstanceTracker<LLNameListCtrl>
+:	public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
 {
 public:
 	typedef enum e_name_type
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e1855a554b63e31562646285700cdbbdea8f9ac9..2a6b2727417d0c6cde29b36fd628a3ce0d18c60f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2651,7 +2651,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			{
 				LLVector3 pos, look_at;
 				U64 region_handle;
-				U8 region_access;
+				U8 region_access = SIM_ACCESS_MIN;
 				std::string region_info = ll_safe_string((char*)binary_bucket, binary_bucket_size);
 				std::string region_access_str = LLStringUtil::null;
 				std::string region_access_icn = LLStringUtil::null;
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ecca00399663b4f848d4a257e8628a48ac701ef3..9885d1aa0d9f0b2a5c90d459eb2ee1eb53b31f6b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -316,8 +316,11 @@ class WindowsManifest(ViewerManifest):
         # For use in crash reporting (generates minidumps)
         self.path("dbghelp.dll")
 
-        # For using FMOD for sound... DJS
-        self.path("fmod.dll")
+        try:
+            # FMOD for sound
+            self.path("fmod.dll")
+        except:
+            print "Skipping FMOD - not found"
 
         self.enable_no_crt_manifest_check()
         
@@ -643,8 +646,11 @@ class DarwinManifest(ViewerManifest):
                                     ):
                         self.path(os.path.join(libdir, libfile), libfile)
 
-                #libfmodwrapper.dylib
-                self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                try:
+                    # FMOD for sound
+                    self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                except:
+                    print "Skipping FMOD - not found"
                 
                 # our apps
                 self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
@@ -933,7 +939,7 @@ class Linux_i686Manifest(LinuxManifest):
                     self.path("libfmod-3.75.so")
                     pass
             except:
-                    print "Skipping libkdu_v42R.so - not found"
+                    print "Skipping libfmod-3.75.so - not found"
                     pass
             self.end_prefix("lib")