diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 1a0a74f..e48a48c 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -83,6 +83,20 @@
   - makedirs: true
   - require:
     - user: user_contrail_database
+
+{% if database.version >= 4 %}
+{% for logdir in [database.get('configdb_log_dir'), database.get('analyticsdb_log_dir')] %}
+{% if logdir %}
+{{ logdir }}/cassandra:
+  file.directory:
+  - makedirs: True
+{{ logdir }}/zookeeper:
+  file.directory:
+  - makedirs: True
+{% endif %}
+{% endfor %}
+{% endif %}
+
 {% endif %}
 
 {{ database.cassandra_config }}logback.xml:
diff --git a/opencontrail/files/2.2/contrail-vrouter-agent.conf b/opencontrail/files/2.2/contrail-vrouter-agent.conf
index 0aa2672..1c306d5 100644
--- a/opencontrail/files/2.2/contrail-vrouter-agent.conf
+++ b/opencontrail/files/2.2/contrail-vrouter-agent.conf
@@ -115,6 +115,9 @@
 
 # Maximum flows allowed per VM (given as % of maximum system flows)
 # max_vm_flows=100
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
 # Maximum number of link-local flows allowed across all VMs
 # max_system_linklocal_flows=4096
 # Maximum number of link-local flows allowed per VM
diff --git a/opencontrail/files/3.0/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
index bea2565..9170aee 100644
--- a/opencontrail/files/3.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -161,6 +161,9 @@
 
 # Maximum flows allowed per VM (given as % of maximum system flows)
 # max_vm_flows=100
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
 # Maximum number of link-local flows allowed across all VMs
 # max_system_linklocal_flows=4096
 # Maximum number of link-local flows allowed per VM
diff --git a/opencontrail/files/4.0/contrail-vrouter-agent.conf b/opencontrail/files/4.0/contrail-vrouter-agent.conf
index 3d244cc..a0a742b 100644
--- a/opencontrail/files/4.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/4.0/contrail-vrouter-agent.conf
@@ -168,6 +168,9 @@
 #
 # Maximum flows allowed per VM (given as % of maximum system flows)
 # max_vm_flows=
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
 
 # Maximum number of link-local flows allowed across all VMs
 # max_system_linklocal_flows=4096
@@ -230,10 +233,8 @@
 # name of virtual host interface
 name=vhost0
 
-{%- if compute.version < 4.1 %}
 # IP address and prefix in ip/prefix_len format
 ip={{ compute.interface.address }}/{{ compute.interface.mask }}
-{%- endif %}
 
 # Gateway IP address for virtual host
 gateway={{ compute.interface.gateway }}