diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8daceb9485d842d109d7959d777ed98cfdb2a2e8..bbaf908d2e50c13cdc5fcf50a913d6cd775ae45c 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -1090,4 +1090,4 @@ void LLButton::resetMouseDownTimer()
 {
 	mMouseDownTimer.stop();
 	mMouseDownTimer.reset();
-}
\ No newline at end of file
+}
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index b450ecbbf91a526696972ecb1218433d21ed8160..dfd315d4516d94a36620a7091c29fd373dd37120 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -115,7 +115,6 @@ LLScrollbar::LLScrollbar(const Params & p)
 
 	LLButton::Params up_btn(mOrientation == VERTICAL ? p.up_button : p.left_button);
 	up_btn.name(std::string("Line Up"));
-	up_btn.label(std::string("Line Up"));
 	up_btn.rect(line_up_rect);
 	up_btn.click_callback.function(boost::bind(&LLScrollbar::onLineUpBtnPressed, this, _2));
 	up_btn.mouse_held_callback.function(boost::bind(&LLScrollbar::onLineUpBtnPressed, this, _2));
@@ -126,7 +125,6 @@ LLScrollbar::LLScrollbar(const Params & p)
 
 	LLButton::Params down_btn(mOrientation == VERTICAL ? p.down_button : p.right_button);
 	down_btn.name(std::string("Line Down"));
-	down_btn.label(std::string("Line Down"));
 	down_btn.rect(line_down_rect);
 	down_btn.follows.flags(FOLLOWS_RIGHT|FOLLOWS_BOTTOM);
 	down_btn.click_callback.function(boost::bind(&LLScrollbar::onLineDownBtnPressed, this, _2));
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 6ca9c4ceda7ca612d63e7f7b274f6ea936a2a3cb..6073b54371ab69a6bf4486e3bb12ca0f7871b697 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -986,7 +986,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 				p.follows.flags = p.follows.flags() | FOLLOWS_BOTTOM;
 			}
 
-			btn = LLUICtrlFactory::create<LLButton>(p);
+++			btn = LLUICtrlFactory::create<LLButton>(p);
 		}
 	}
 	
@@ -1645,7 +1645,6 @@ void LLTabContainer::initButtons()
 
 		LLButton::Params prev_btn_params;
 		prev_btn_params.name(std::string("Up Arrow"));
-		prev_btn_params.label(std::string("Up Arrow"));
 		prev_btn_params.rect(up_arrow_btn_rect);
 		prev_btn_params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
 		prev_btn_params.image_unselected.name("scrollbutton_up_out_blue.tga");
@@ -1655,7 +1654,6 @@ void LLTabContainer::initButtons()
 
 		LLButton::Params next_btn_params;
 		next_btn_params.name(std::string("Down Arrow"));
-		next_btn_params.label(std::string("Down Arrow"));
 		next_btn_params.rect(down_arrow_btn_rect);
 		next_btn_params.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT);
 		next_btn_params.image_unselected.name("scrollbutton_down_out_blue.tga");
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 9a26f0b4726be0e54ebf089ac5ffd58b40bc9479..8cbb53dda289d54e9fce5b0a9dd366592dc73f43 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1450,9 +1450,7 @@ void LLTextBase::setText(const LLStringExplicit &utf8str)
 
 	appendText(text, false);
 
-	//resetDirty();
 	onValueChange(0, getLength());
-	needsReflow();
 }
 
 //virtual
@@ -1630,8 +1628,6 @@ void LLTextBase::appendAndHighlightText(const std::string &new_text, bool prepen
 		insertStringNoUndo(getLength(), wide_text, &segments);
 	}
 
-	needsReflow();
-	
 	// Set the cursor and scroll position
 	if( selection_start != selection_end )
 	{
@@ -2115,7 +2111,7 @@ LLRect LLTextBase::getVisibleDocumentRect() const
 		LLRect doc_rect = mDocumentView->getLocalRect();
 		doc_rect.mLeft -= mDocumentView->getRect().mLeft;
 		// adjust for height of text above widget baseline
-		doc_rect.mBottom = llmin(0, doc_rect.getHeight() - mTextRect.getHeight());
+		doc_rect.mBottom = doc_rect.getHeight() - mTextRect.getHeight();
 		return doc_rect;
 	}
 }