diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 68a7b22ae..bdb0299b1 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -768,8 +768,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		file.write(ostr.str().c_str(),ostr.str().length());
 		if(!error_str.empty())
 		{
-			LLAPRFile file2(maindir + shader_name + "_ERROR" + ".txt", LL_APR_W);
-			file.write(error_str.c_str(),error_str.length());
+			LLAPRFile file2(maindir + shader_name + "_ERROR.txt", LL_APR_W);
+			file2.write(error_str.c_str(),error_str.length());
 		}
 	}
 	stop_glerror();
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 47e2f4bf7..b782e0091 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -354,7 +354,14 @@ void LLViewerShaderMgr::setShaders()
 
 	{
 		const std::string dumpdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"shader_dump")+gDirUtilp->getDirDelimiter();
-		boost::filesystem::remove_all(dumpdir);
+		try 
+		{
+			boost::filesystem::remove_all(dumpdir);
+		}
+		catch(const boost::filesystem::filesystem_error& e)
+		{
+			llinfos << "boost::filesystem::remove_all(\""+dumpdir+"\") failed: '" + e.code().message() + "'" << llendl;
+		}
 	}
 
 	LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) gSavedSettings.getU32("RenderMaxTextureIndex")), 1);
@@ -379,9 +386,9 @@ void LLViewerShaderMgr::setShaders()
 		LLShaderMgr::instance()->mDefinitions["textureCube"]	= "texture";
 		LLShaderMgr::instance()->mDefinitions["texture2DLod"]	= "textureLod";
 		LLShaderMgr::instance()->mDefinitions["texture2DRect"]	= "texture";
-		LLShaderMgr::instance()->mDefinitions["shadow2D"]		= "texture";
-		LLShaderMgr::instance()->mDefinitions["shadow2DRect"]	= "texture";
-		LLShaderMgr::instance()->mDefinitions["shadow2DProj"]	= "textureProj";
+		LLShaderMgr::instance()->mDefinitions["shadow2D(a,b)"]		= "vec2(texture(a,b))";		//Shadow lookups only return a single float.
+		LLShaderMgr::instance()->mDefinitions["shadow2DRect(a,b)"]	= "vec2(texture(a,b))";
+		LLShaderMgr::instance()->mDefinitions["shadow2DProj(a,b)"]	= "vec2(textureProj(a,b))";
 		LLShaderMgr::instance()->mDefinitions["ftransform()"]	= "gl_ModelViewProjectionMatrix * gl_Vertex";
 	}