diff --git a/ironic/conductor.sls b/ironic/conductor.sls
index 9fb0df9..536a634 100644
--- a/ironic/conductor.sls
+++ b/ironic/conductor.sls
@@ -64,8 +64,8 @@
   file.managed:
     - name: {{ conductor.tftp_root }}/map-file
     - contents: |
-        r ^([^/]) {{ conductor.tftp_root }}/\\1
-        r ^(/tftpboot/) {{ conductor.tftp_root }}/\2
+        r ^[^/] /\0
+        r ^({{ conductor.tftp_root }}) /\2
     - user: 'ironic'
     - group: 'ironic'
     - require:
diff --git a/ironic/files/newton/ironic.conf b/ironic/files/newton/ironic.conf
index d558b9e..2b984c2 100644
--- a/ironic/files/newton/ironic.conf
+++ b/ironic/files/newton/ironic.conf
@@ -1055,14 +1055,22 @@
 # Agent ramdisk. If unset, will use the priority set in the
 # ramdisk (defaults to 10 for the GenericHardwareManager). If
 # set to 0, will not run during cleaning. (integer value)
+{%- if conductor.erase_devices_priority is defined %}
+erase_devices_priority = {{ conductor.erase_devices_priority }}
+{%- else %}
 #erase_devices_priority = <None>
+{%- endif %}
 
 # Priority to run in-band clean step that erases metadata from
 # devices, via the Ironic Python Agent ramdisk. If unset, will
 # use the priority set in the ramdisk (defaults to 99 for the
 # GenericHardwareManager). If set to 0, will not run during
 # cleaning. (integer value)
+{%- if conductor.erase_devices_metadata_priority is defined %}
+erase_devices_metadata_priority = {{ conductor.erase_devices_metadata_priority }}
+{%- else %}
 #erase_devices_metadata_priority = <None>
+{%- endif %}
 
 # During shred, overwrite all block devices N times with
 # random data. This is only used if a device could not be ATA
diff --git a/ironic/files/ocata/ironic.conf b/ironic/files/ocata/ironic.conf
index 0289f13..cc45876 100644
--- a/ironic/files/ocata/ironic.conf
+++ b/ironic/files/ocata/ironic.conf
@@ -1353,14 +1353,22 @@
 # Agent ramdisk. If unset, will use the priority set in the
 # ramdisk (defaults to 10 for the GenericHardwareManager). If
 # set to 0, will not run during cleaning. (integer value)
+{%- if conductor.erase_devices_priority is defined %}
+erase_devices_priority = {{ conductor.erase_devices_priority }}
+{%- else %}
 #erase_devices_priority = <None>
+{%- endif %}
 
 # Priority to run in-band clean step that erases metadata from
 # devices, via the Ironic Python Agent ramdisk. If unset, will
 # use the priority set in the ramdisk (defaults to 99 for the
 # GenericHardwareManager). If set to 0, will not run during
 # cleaning. (integer value)
+{%- if conductor.erase_devices_metadata_priority is defined %}
+erase_devices_metadata_priority = {{ conductor.erase_devices_metadata_priority }}
+{%- else %}
 #erase_devices_metadata_priority = <None>
+{%- endif %}
 
 # During shred, overwrite all block devices N times with
 # random data. This is only used if a device could not be ATA
diff --git a/ironic/map.jinja b/ironic/map.jinja
index 09127b7..4f71018 100644
--- a/ironic/map.jinja
+++ b/ironic/map.jinja
@@ -19,7 +19,7 @@
     'Debian': {
         'pkgs': ['ipmitool', 'ironic-conductor', 'tftpd-hpa', 'syslinux-common', 'pxelinux', 'ipxe'],
         'pxelinux_path': '/usr/lib/PXELINUX',
-        'syslinux_files': ['chain.c32', 'libcom32.c32', 'libutil.c32'],
+        'syslinux_files': ['chain.c32', 'libcom32.c32', 'libutil.c32', 'ldlinux.c32'],
         'syslinux_path': '/usr/lib/syslinux/modules/bios',
         'ipxe_rom_path': '/usr/lib/ipxe',
     },