diff --git a/heka/files/lua/common/extra_fields.lua b/heka/files/lua/common/extra_fields.lua
new file mode 100644
index 0000000..d75fdc7
--- /dev/null
+++ b/heka/files/lua/common/extra_fields.lua
@@ -0,0 +1,20 @@
+-- Copyright 2015 Mirantis, Inc.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+local M = {}
+setfenv(1, M) -- Remove external access to contain everything in the module
+
+-- list of fields that are added to Heka messages by the collector
+tags = {}
+
+return M
diff --git a/heka/files/toml/splitter/regex.toml b/heka/files/toml/splitter/regex.toml
index 1f4a6c9..0e0297b 100644
--- a/heka/files/toml/splitter/regex.toml
+++ b/heka/files/toml/splitter/regex.toml
@@ -1,4 +1,4 @@
 [{{ splitter_name }}_splitter]
 type = "RegexSplitter"
 delimiter = "{{ splitter.delimiter }}"
-delimiter_eol = "{{ splitter.delimiter_eol }}"
+delimiter_eol = {{ splitter.delimiter_eol|lower }}
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 4ecaeac..a2fc8fa 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -26,20 +26,20 @@
     heka_collectd:
       engine: sandbox
       module_file: /usr/share/lma_collector/decoders/collectd.lua
-      module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
       config:
         hostname: '{{ grains.fqdn.split('.')[0] }}'
         swap_size: 4294967296
     heka_http_check:
       engine: sandbox
       module_file: /usr/share/lma_collector/decoders/noop.lua
-      module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
       config:
         msg_type: lma.http-check
     heka_metric:
       engine: sandbox
       module_file: /usr/share/lma_collector/decoders/metric.lua
-      module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
       config:
         deserialize_bulk_metric_for_loggers: 'aggregated_http_metrics_filter hdd_errors_counter_filter'
   input:
@@ -71,7 +71,7 @@
     heka_metric_collector:
       engine: sandbox
       module_file: /usr/share/lma_collector/filters/heka_monitoring.lua
-      module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
       preserve_data: false
       message_matcher: "Type == 'heka.all-report'"
   encoder: