diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 04bd7e645625c74a833c1cdd85aad4759f13c48d..f0994152ed1e715bfef5c1c499e5512e98354b64 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -252,8 +252,6 @@ class LLFace : public LLTrace::MemTrackableNonVirtual<LLFace, 16>
 	F32			mLastSkinTime;
 	F32			mLastMoveTime;
 	LLMatrix4*	mTextureMatrix;
-	LLMatrix4*	mSpecMapMatrix;
-	LLMatrix4*	mNormalMapMatrix;
 	LLDrawInfo* mDrawInfo;
 
 private:
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index a9c5e3db631d984ce8695d29b9a987e93cfa8dc7..597f8ba9f505c3f1d81fb5143697fac9abcf8b8c 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -2282,7 +2282,7 @@ void LLFloaterIMContainer::reSelectConversation()
 
 void LLFloaterIMContainer::updateSpeakBtnState()
 {
-	mSpeakBtn->setToggleState(LLVoiceClient::getInstance()->getUserPTTState());
+	mSpeakBtn->setToggleState(LLVoiceClient::getInstanceFast()->getUserPTTState());
 	mSpeakBtn->setEnabled(LLAgent::isActionAllowed("speak"));
 }
 
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index b8a0767264e79b9184111c074e80941ced772096..88a822fd32b97cbb04bae24d4e7ec3b5d3319ef4 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -102,9 +102,7 @@ class LLDrawInfo : public LLRefCount, public LLTrace::MemTrackableNonVirtual<LLD
 	U32 mBlendFuncDst;
 	BOOL mHasGlow;
 	LLPointer<LLViewerTexture> mSpecularMap;
-	const LLMatrix4* mSpecularMapMatrix;
 	LLPointer<LLViewerTexture> mNormalMap;
-	const LLMatrix4* mNormalMapMatrix;
 	LLVector4 mSpecColor; // XYZ = Specular RGB, W = Specular Exponent
 	F32  mEnvIntensity;
 	F32  mAlphaMaskCutoff;