diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index a0104c2a8..9f1b0d30b 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -495,7 +495,7 @@ void Stats::print(void)
   // Each AICurlEasyRequestStateMachine has one AICurlEasyRequest member.
   llassert(AICurlEasyRequest_count >= AICurlEasyRequestStateMachine_count);
   // AIFIXME: is this really always the case? And why?
-  llassert(easy_handles <= ResponderBase_count);
+  llassert(easy_handles <= S32(ResponderBase_count));
 }
 
 } // namespace AICurlInterface
diff --git a/indra/llmessage/aicurlperhost.cpp b/indra/llmessage/aicurlperhost.cpp
index 7f7490865..b444ba6df 100644
--- a/indra/llmessage/aicurlperhost.cpp
+++ b/indra/llmessage/aicurlperhost.cpp
@@ -92,13 +92,13 @@ void PerHostRequestQueue::release(PerHostRequestQueuePtr& instance)
 
 bool PerHostRequestQueue::throttled() const
 {
-  llassert(mAdded <= curl_concurrent_connections_per_host);
-  return mAdded == curl_concurrent_connections_per_host;
+  llassert(mAdded <= int(curl_concurrent_connections_per_host));
+  return mAdded == int(curl_concurrent_connections_per_host);
 }
 
 void PerHostRequestQueue::added_to_multi_handle(void)
 {
-  llassert(mAdded < curl_concurrent_connections_per_host);
+  llassert(mAdded < int(curl_concurrent_connections_per_host));
   ++mAdded;
 }
 
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 93390e1e5..efa26eb7f 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1844,8 +1844,9 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 				local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
 			}
 
+			static const LLCachedControl<bool> sg_ignore_sim_cam_consts("SGIgnoreSimulatorCameraConstraints",false);
 			if ( !mCameraCollidePlane.isExactlyZero()
-				 && !gSavedSettings.getBOOL("SGIgnoreSimulatorCameraConstraints")
+				 && !sg_ignore_sim_cam_consts
 				 && isAgentAvatarValid()
 				 && !gAgentAvatarp->isSitting())
 			{
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 9f8b9c0a4..2934596e1 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1471,7 +1471,7 @@ void LLViewerObjectList::updateActive(LLViewerObject *objectp)
 			}
 			else
 			{
-				llassert(idx < mActiveObjects.size());
+				llassert(idx < (S32)mActiveObjects.size());
 				llassert(mActiveObjects[idx] == objectp);
 
 				if (idx >= (S32)mActiveObjects.size() ||