diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index de9c5547f..627f06c80 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -478,6 +478,16 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
 	{
 		if(!factory->builtPanel(panelp))
 			panelp->initPanelXML(node, parent, factory);
+		else
+		{
+			LLRect new_rect = panelp->getRect();
+			// override rectangle with embedding parameters as provided
+			panelp->createRect(node, new_rect, parent);
+			panelp->setOrigin(new_rect.mLeft, new_rect.mBottom);
+			panelp->setShape(new_rect);
+			// optionally override follows flags from including nodes
+			panelp->parseFollowsFlags(node);
+		}
 	}
 
 	return panelp;
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 2f48e7ff7..07fae3df2 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -999,7 +999,7 @@ void commit_select_tool(LLUICtrl *ctrl, void *data)
 	S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
 
 	LLCheckBoxCtrl* group = (LLCheckBoxCtrl*)ctrl;
-	std::string selected = group->getValue().asString();
+	std::string selected = group->getName();
 	if (selected == "radio position")
 	{
 		LLFloaterTools::setEditTool( LLToolCompTranslate::getInstance() );