diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index c13ea4fbade6dedae707c1e885332ceb9b5b013f..ade5a070ccfdd929736fa588baa528e45531f9cb 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -9,9 +9,9 @@ add_library( ll::libjpeg INTERFACE IMPORTED )
 use_system_binary(libjpeg)
 use_prebuilt_binary(libjpeg-turbo)
 if (LINUX)
-  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
 elseif (DARWIN)
-  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
 elseif (WINDOWS)
     target_link_libraries( ll::libjpeg INTERFACE
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib
diff --git a/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
index 49470f0e398e95f0cc577aaf39cc690020b6defc..ce018623a883fc892743841005350dac0cce211f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
@@ -23,8 +23,7 @@
  * $/LicenseInfo$
  */
 
-uniform sampler2D       noiseMap;
-uniform sampler2D   normalMap;
+uniform sampler2D   noiseMap;
 uniform sampler2D   depthMap;
 
 uniform float ssao_radius;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
index ef93d8063429d84326e3af9f4d11afe7afaf7df5..44d55161478c77a7d2fc19f8da9f2ff29ff74884 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
@@ -50,7 +50,6 @@ SOFTWARE.
 
 uniform sampler2D   normalMap;
 uniform sampler2D   depthMap;
-uniform sampler2D emissiveRect;
 uniform sampler2D projectionMap; // rgba
 uniform sampler2D brdfLut;