diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b1842da0a..1ba6f7d6b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -28,7 +28,7 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>S32</string>
+    <string>U32</string>
     <key>Value</key>
     <integer>30</integer>
   </map>
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 79da3805b..4fbcf0187 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -712,6 +712,7 @@ void LLPanelLogin::setFields(const LLSavedLoginEntry& entry, bool takeFocus)
 	std::string fullname = nameJoin(entry.getFirstName(), entry.getLastName()); 
 	LLComboBox* login_combo = sInstance->getChild<LLComboBox>("name_combo");
 	login_combo->setTextEntry(fullname);
+	login_combo->resetTextDirty();
 	//sInstance->childSetText("name_combo", fullname);
 
 	std::string grid = entry.getGrid();
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 967d56b9d..83de34ecd 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -479,8 +479,8 @@ static bool sgConnectionThrottle() {
 	LLMutexLock lock(&mutex);
 	const U32 THROTTLE_TIMESTEPS_PER_SECOND = 10;
 	static const LLCachedControl<U32> max_connections_per_second("HTTPRequestRate", 30);
-	S32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
-	const S32 timestep = USEC_PER_SEC/THROTTLE_TIMESTEPS_PER_SECOND;
+	U32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
+	const U32 timestep = USEC_PER_SEC/THROTTLE_TIMESTEPS_PER_SECOND;
 	U64 now = LLTimer::getTotalTime();
 	std::deque<U64> timestamps;
 	while(!timestamps.empty() && (timestamps[0]<=now-timestep)) {