diff --git a/README.rst b/README.rst
index 3c9cc8c..6d463cb 100644
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,8 @@
         elasticsearch_host: 172.16.10.253
         elasticsearch_port: 9200
         enabled: true
+        metric_collector_host: 127.0.0.1
+        metric_collector_port: 5567
         poolsize: 100
 
 Default values:
@@ -25,6 +27,8 @@
 * ``automatic_starting: true``
 * ``elastisearch_port: 9200``
 * ``enabled: false``
+* ``metric_collector_host: 127.0.0.1``
+* ``metric_collector_port: 5567``
 * ``poolsize: 100``
 
 Local Metric collector service
@@ -92,6 +96,8 @@
 
 * ``aggregator_port: 5565``
 * ``amqp_exchange: nova``
+* ``amqp_port: 5672``
+* ``amqp_vhost: ''``
 * ``automatic_starting: true``
 * ``elastisearch_port: 9200``
 * ``enabled: false``
@@ -156,11 +162,13 @@
 
 Default values:
 
+* ``automatic_starting: true``
 * ``elastisearch_port: 9200``
 * ``enabled: false``
 * ``influxdb_port: 8086``
 * ``influxdb_time_precision: ms``
 * ``influxdb_timeout: 5000``
+* ``poolsize: 100``
 * ``rabbit_port: 5672``
 * ``rabbit_vhost: /openstack``
 * ``rabbit_queue: metering.sample``
diff --git a/heka/files/lua/decoders/generic_syslog.lua b/heka/files/lua/decoders/generic_syslog.lua
index 48e5262..1307e01 100644
--- a/heka/files/lua/decoders/generic_syslog.lua
+++ b/heka/files/lua/decoders/generic_syslog.lua
@@ -23,7 +23,7 @@
     Payload     = nil,
     Pid         = nil,
     Fields      = nil,
-    Severity    = nil,
+    Severity    = 6, -- INFO
 }
 
 local syslog_pattern = read_config("syslog_pattern") or error("syslog_pattern configuration must be specified")
diff --git a/heka/map.jinja b/heka/map.jinja
index 908c5df..2e47090 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -38,6 +38,8 @@
 {% set default_nagios_port = 8001 %}
 {% set default_nagios_host_alarm_clusters = '00-clusters' %}
 {% set default_automatic_starting = True %}
+{% set default_amqp_port = 5672 %}
+{% set default_amqp_vhost = '' %}
 
 {% set default_rabbit_port = 5672 %}
 {% set default_rabbit_vhost = '/openstack' %}
@@ -48,6 +50,8 @@
     'elasticsearch_port': default_elasticsearch_port,
     'poolsize': 100,
     'automatic_starting': default_automatic_starting,
+    'metric_collector_host': '127.0.0.1',
+    'metric_collector_port': 5567,
   }
 }, merge=salt['pillar.get']('heka:log_collector')) %}
 
@@ -65,6 +69,9 @@
 
 {% set remote_collector = salt['grains.filter_by']({
   'default': {
+    'amqp_port': default_amqp_port,
+    'amqp_vhost': default_amqp_vhost,
+    'elasticsearch_port': default_elasticsearch_port,
     'influxdb_port': default_influxdb_port,
     'influxdb_time_precision': default_influxdb_time_precision,
     'influxdb_timeout': default_influxdb_timeout,
@@ -96,5 +103,7 @@
     'rabbit_vhost': default_rabbit_vhost,
     'rabbit_queue': default_ceilometer_rabbit_queue,
     'resource_decoding': False,
+    'poolsize': 100,
+    'automatic_starting': default_automatic_starting,
   }
 }, merge=salt['pillar.get']('heka:ceilometer_collector')) %}
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index fcf3cf0..d6d73bd 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -39,8 +39,8 @@
   output:
     metric_collector:
       engine: tcp
-      host: 127.0.0.1
-      port: 5567
+      host: {{ log_collector.metric_collector_host }}
+      port: {{ log_collector.metric_collector_port }}
       message_matcher: "(Type == 'metric' || Type == 'heka.sandbox.metric' || Type == 'heka.sandbox.bulk_metric')"
     log_dashboard:
       engine: dashboard
@@ -184,7 +184,7 @@
       port: {{ remote_collector.amqp_port }}
       user: {{ remote_collector.amqp_user }}
       password: {{ remote_collector.amqp_password }}
-      vhost: {{ remote_collector.get('amqp_vhost', '') }}
+      vhost: {{ remote_collector.amqp_vhost }}
       exchange: {{ remote_collector.get('amqp_exchange', 'nova') }}
       exchange_type: topic
       exchange_durability: false
diff --git a/metadata/service/ceilometer_collector/single.yml b/metadata/service/ceilometer_collector/single.yml
index bfc6e75..eacb11d 100644
--- a/metadata/service/ceilometer_collector/single.yml
+++ b/metadata/service/ceilometer_collector/single.yml
@@ -3,6 +3,11 @@
 classes:
 - service.heka.support
 parameters:
+  _param:
+    ceilometer_collector_poolsize: 100
   heka:
     ceilometer_collector:
+      automatic_starting: true
       enabled: true
+      influxdb_time_precision: ms
+      poolsize: ${_param:ceilometer_collector_poolsize}