diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8eea88f97..047b09f15 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -601,7 +601,7 @@
 		<key>Comment</key>
 		<string>Show Windlight popup</string>
 		<key>Persist</key>
-		<integer>1</integer>
+		<integer>0</integer>
 		<key>Type</key>
 		<string>Boolean</string>
 		<key>Value</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index b60be99eb..6b45ca1ae 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1981,7 +1981,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
 		
 		mCameraZoomFraction = (mTargetCameraDistance - meters) / camera_offset_dist;
 
-		if (!gSavedSettings.getF32("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
+		if (!gSavedSettings.getBOOL("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
 		{
 			// No need to animate, camera is already there.
 			changeCameraToMouselook(FALSE);
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 7c71dc508..6823e4f6e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -373,7 +373,7 @@
 			  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 						 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
 						 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-						 mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+						 mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
 				Last Owner:
 				</text>
 			  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"