diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 17b1dfa9f895dc695ad8ae80e5fd3696f22ea29d..a7869a830a81f3f1439b1d3e5e71d692e20f2920 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -316,8 +316,9 @@ namespace LLError
 #define llcallstacks                                                                      \
 	if (false)																			  \
 	{                                                                                     \
-       std::ostringstream* _out = LLError::LLCallStacks::insert(__FUNCTION__, __LINE__) ; \
-       (*_out)
+        std::ostringstream _out;                                                          \
+        LLError::LLCallStacks::insert(_out, __FUNCTION__, __LINE__) ;                     \
+        _out
 
 #define llcallstacksendl                   \
 		LLError::End();                    \
@@ -381,8 +382,8 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 #define lllog_test_debug_()                                       \
 		if (LL_UNLIKELY(_site.shouldLog()))                 \
 		{                                                   \
-			std::ostringstream* _out = LLError::Log::out(); \
-			(*_out)
+			std::ostringstream _out; \
+			_out
 #else
 #define lllog_debug(level, once, ...)                                         \
 	do {                                                                \
@@ -390,8 +391,8 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 		{                                                   \
 			const char* tags[] = {"", ##__VA_ARGS__};                       \
 			LLError::CallSite _site(lllog_site_args_(level, once, tags)); \
-			std::ostringstream* _out = LLError::Log::out(); \
-			(*_out)
+			std::ostringstream _out; \
+			_out
 #endif
 
 #define lllog_site_args_(level, once, tags)                 \
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 550a7cc48d883286625d1df2ff3f308fd245812c..40f8ba7c52e9452d8050c43cb6b33b71dac6c1f5 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -344,7 +344,7 @@ void LLFolderView::filter( LLFolderViewFilter& filter )
 	LL_RECORD_BLOCK_TIME(FTM_FILTER);
     static LLUICachedControl<S32> time_visible("FilterItemsMaxTimePerFrameVisible", 10);
     static LLUICachedControl<S32> time_invisible("FilterItemsMaxTimePerFrameUnvisible", 1);
-    filter.resetTime(llclamp(mParentPanel.get()->getVisible() ? filter_visible() : filter_hidden(), 1, 100));
+    filter.resetTime(llclamp(mParentPanel.get()->getVisible() ? time_visible() : time_invisible(), 1, 100));
 
     // Note: we filter the model, not the view
 	getViewModelItem()->filter(filter);
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 62abbcf2af477cbcf152a3b40933999141fca5b4..0a91960e43a021248264de4dbc21050b50c86812 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -217,6 +217,8 @@ void LLUI::setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t& rem
 	mAddPopupFunc = add_popup;
 	mRemovePopupFunc = remove_popup;
 	mClearPopupsFunc = clear_popups;
+}
+
 // static
 void LLUI::setMousePositionScreen(S32 x, S32 y)
 {