diff --git a/nova/compute.sls b/nova/compute.sls
index 7839551..995bd6a 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -206,18 +206,6 @@
     - pkg: nova_compute_packages
   - onlyif: "virsh net-list | grep default"
 
-{%- if compute.hugepages is defined %}
-
-/etc/default/qemu-kvm:
-  file.managed:
-  - contents: KVM_HUGEPAGES=1
-  - require:
-    - pkg: nova_compute_packages
-  - require_in:
-    - service: {{ compute.libvirt_service }}
-
-{%- endif %}
-
 {{ compute.libvirt_service }}:
   service.running:
   - enable: true
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index 0c61ff7..bf7d9dd 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -90,11 +90,12 @@
 
 #NoVNC
 vnc_enabled=true
+novncproxy_host={{ controller.bind.get('novncproxy_address', '0.0.0.0') }}
 {%- if pillar.nova.compute is defined %}
 vncserver_listen={{ controller.bind.private_address }}
 vncserver_proxyclient_address={{ controller.bind.private_address }}
 {%- else %}
-vncserver_listen=0.0.0.0
+vncserver_listen={{ controller.bind.get('novncproxy_address', '0.0.0.0') }}
 {%- endif %}
 novncproxy_base_url={{ controller.vncproxy_url }}/vnc_auto.html
 novncproxy_port={{ controller.bind.get('vncproxy_port', '6080') }}
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index b0b4ae1..2711cb8 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -70,14 +70,14 @@
 
 [vnc]
 enabled = true
-novncproxy_host = 0.0.0.0
+novncproxy_host = {{ controller.bind.get('novncproxy_address', '0.0.0.0') }}
 novncproxy_base_url = {{ controller.vncproxy_url }}/vnc_auto.html
 novncproxy_port={{ controller.bind.get('vncproxy_port', '6080') }}
 {%- if pillar.nova.compute is defined %}
 vncserver_listen={{ controller.bind.private_address }}
 vncserver_proxyclient_address={{ controller.bind.private_address }}
 {%- else %}
-vncserver_listen=0.0.0.0
+vncserver_listen={{ controller.bind.get('novncproxy_address', '0.0.0.0') }}
 {%- endif %}
 
 [spice]
diff --git a/nova/files/mitaka/qemu.conf.Debian b/nova/files/mitaka/qemu.conf.Debian
index 1df1b06..5b039c4 100644
--- a/nova/files/mitaka/qemu.conf.Debian
+++ b/nova/files/mitaka/qemu.conf.Debian
@@ -340,6 +340,7 @@
 #hugetlbfs_mount = ["/run/hugepages/kvm", "/mnt/hugepages_1GB"]
 {%- if compute.hugepages is defined %}
 hugetlbfs_mount = [{%- for mount in compute.hugepages.mount_points %}"{{ mount.path }}"{% if not loop.last %}, {% endif %}{%- endfor %}]
+security_driver="none"
 {%- endif %}
 
 # Path to the setuid helper for creating tap devices.  This executable