diff --git a/build/common/installer/scripts/tomlparser.rb b/build/common/installer/scripts/tomlparser.rb
index 7235ee0c3..decebc624 100644
--- a/build/common/installer/scripts/tomlparser.rb
+++ b/build/common/installer/scripts/tomlparser.rb
@@ -228,7 +228,7 @@ def get_command_windows(env_variable_name, env_variable_value)
     file.write(commands)
     commands = get_command_windows('AZMON_LOG_TAIL_PATH', @logTailPath)
     file.write(commands)
-    commands = get_command_windows('AZMON_LOG_EXCLUSION_REGEX_PATTERN', @stdoutExcludeNamespaces)
+    commands = get_command_windows('AZMON_LOG_EXCLUSION_REGEX_PATTERN', @logExclusionRegexPattern)
     file.write(commands)
     commands = get_command_windows('AZMON_STDOUT_EXCLUDED_NAMESPACES', @stdoutExcludeNamespaces)
     file.write(commands)
diff --git a/build/windows/installer/certificategenerator/Program.cs b/build/windows/installer/certificategenerator/Program.cs
index 43063c4be..e24d0e303 100644
--- a/build/windows/installer/certificategenerator/Program.cs
+++ b/build/windows/installer/certificategenerator/Program.cs
@@ -414,14 +414,12 @@ static void Main(string[] args)
 
             try
             {
-                if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WSKEY")))
-                {
-                    logAnalyticsWorkspaceSharedKey = Environment.GetEnvironmentVariable("WSKEY");
-                }
+              // WSKEY isn't stored as an environment variable
+              logAnalyticsWorkspaceSharedKey = File.ReadAllText("C:/etc/omsagent-secret/KEY").Trim();
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Failed to read env variables (WSKEY)" + ex.Message);
+                Console.WriteLine("Failed to read secret (WSKEY)" + ex.Message);
             }
 
             try
diff --git a/build/windows/installer/conf/fluent.conf b/build/windows/installer/conf/fluent.conf
index c96300b1e..d5eb475ca 100644
--- a/build/windows/installer/conf/fluent.conf
+++ b/build/windows/installer/conf/fluent.conf
@@ -6,7 +6,8 @@
 
 <source>
   @type tail
-  path /var/log/containers/*.log
+  path "#{ENV['AZMON_LOG_TAIL_PATH']}"
+  exclude_path "#{ENV['AZMON_CLUSTER_LOG_TAIL_EXCLUDE_PATH']}"
   pos_file /var/opt/microsoft/fluent/fluentd-containers.log.pos
   tag oms.container.log.la
   @log_level trace
@@ -28,6 +29,14 @@
   @include fluent-docker-parser.conf
 </source>
 
+<filter oms.container.log.la>
+  @type grep
+  <exclude>
+    key stream
+    pattern "#{ENV['AZMON_LOG_EXCLUSION_REGEX_PATTERN']}"
+  </exclude>
+</filter>
+
 <filter  oms.container.**>
   @type record_transformer
   # fluent-plugin-record-modifier more light-weight but needs to be installed (dependency worth it?)
@@ -37,7 +46,6 @@
   </record>
 </filter>
 
-
 <match oms.container.**>
   @type forward
   send_timeout 60s
diff --git a/kubernetes/windows/main.ps1 b/kubernetes/windows/main.ps1
index d32e5068a..a297e3801 100644
--- a/kubernetes/windows/main.ps1
+++ b/kubernetes/windows/main.ps1
@@ -64,19 +64,11 @@ function Set-EnvironmentVariables {
         $wsID = Get-Content /etc/omsagent-secret/WSID
     }
 
-    # Set DOMAIN
+    # Set WSID
     [System.Environment]::SetEnvironmentVariable("WSID", $wsID, "Process")
     [System.Environment]::SetEnvironmentVariable("WSID", $wsID, "Machine")
 
-    $wsKey = ""
-    if (Test-Path /etc/omsagent-secret/KEY) {
-        # TODO: Change to omsagent-secret before merging
-        $wsKey = Get-Content /etc/omsagent-secret/KEY
-    }
-
-    # Set KEY
-    [System.Environment]::SetEnvironmentVariable("WSKEY", $wsKey, "Process")
-    [System.Environment]::SetEnvironmentVariable("WSKEY", $wsKey, "Machine")
+    # Don't store WSKEY as environment variable
 
     $proxy = ""
     if (Test-Path /etc/omsagent-secret/PROXY) {
diff --git a/source/plugins/ruby/filter_cadvisor2mdm.rb b/source/plugins/ruby/filter_cadvisor2mdm.rb
index 2423ad024..8d7e729c8 100644
--- a/source/plugins/ruby/filter_cadvisor2mdm.rb
+++ b/source/plugins/ruby/filter_cadvisor2mdm.rb
@@ -308,8 +308,16 @@ def ensure_cpu_memory_capacity_set
         end
       elsif controller_type.downcase == "daemonset"
         capacity_from_kubelet = KubeletUtils.get_node_capacity
-        @cpu_capacity = capacity_from_kubelet[0]
-        @memory_capacity = capacity_from_kubelet[1]
+
+        # Error handling in case /metrics/cadvsior endpoint fails
+        if !capacity_from_kubelet.nil? && capacity_from_kubelet.length > 1
+          @cpu_capacity = capacity_from_kubelet[0]
+          @memory_capacity = capacity_from_kubelet[1]
+        else
+          # cpu_capacity and memory_capacity keep initialized value of 0.0
+          @log.error "Error getting capacity_from_kubelet: cpu_capacity and memory_capacity"
+        end
+
       end
     end