diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 38d044473..e52492c38 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,9 +2,9 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
-  use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   if(LINUX)
+	use_prebuilt_binary(libuuid)
     if (${ARCH} STREQUAL "x86_64")
      use_prebuilt_binary(32bitcompatibilitylibs)
 	endif (${ARCH} STREQUAL "x86_64")
diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h
index 70cd2a3db..0d0a6ac1d 100644
--- a/indra/llcommon/aithreadsafe.h
+++ b/indra/llcommon/aithreadsafe.h
@@ -288,7 +288,7 @@ protected:
 	//! Constructor used by AIWriteAccess.
 	AIReadAccess(AIThreadSafe<T>& wrapper, state_type state) : AIReadAccessConst<T>(wrapper, state) { }
 
-	friend class AIWriteAccess<T>;
+	friend struct AIWriteAccess<T>;
 };
 
 /**