diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index d5ad38dff3725e3686806773ab74a043e05c05b0..a7bfe64f92776238b7bab0d548e0e97255cc75bd 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -628,7 +628,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 					{
 						S32 bytes = w * h * mComponents;
 						llassert(prev_mip_data);
-						llassert(prev_mip_size == bytes);
+						llassert(prev_mip_size == bytes*4);
 						U8* new_data = new U8[bytes];
 						llassert_always(new_data);
 						LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index a75303218007a4b6b09e6b4bf7d2bc706f7830c8..2c283faf3b46b25ac2aa987bfc4cbb28d0c59e1c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1259,8 +1259,8 @@ void LLViewerWindow::handleFocusLost(LLWindow *window)
 	}
 
 	// restore mouse cursor
-	gViewerWindow->showCursor();
-	gViewerWindow->getWindow()->setMouseClipping(FALSE);
+	showCursor();
+	getWindow()->setMouseClipping(FALSE);
 
 	// JC - Leave keyboard focus, so if you're popping in and out editing
 	// a script, you don't have to click in the editor again and again.
@@ -1435,7 +1435,7 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window,  S32 x,  S32 y, S32 width,  S
 
 void LLViewerWindow::handleScrollWheel(LLWindow *window,  S32 clicks)
 {
-	gViewerWindow->handleScrollWheel( clicks );
+	handleScrollWheel( clicks );
 }
 
 void LLViewerWindow::handleWindowBlock(LLWindow *window)