diff --git a/overlays/generic/etc/passwd.ww b/overlays/generic/etc/passwd.ww
index e436e34b..abace04d 100644
--- a/overlays/generic/etc/passwd.ww
+++ b/overlays/generic/etc/passwd.ww
@@ -1,3 +1 @@
-root::0:0:root:/root:/bin/bash
 {{IncludeFrom $.Container "/etc/passwd"}}
-{{Include "/etc/passwd"}}
diff --git a/overlays/wwinit/etc/issue.ww b/overlays/wwinit/etc/issue.ww
index 2cfb8053..38088e3d 100644
--- a/overlays/wwinit/etc/issue.ww
+++ b/overlays/wwinit/etc/issue.ww
@@ -7,6 +7,6 @@ Network:
 {{- range $devname, $netdev := .NetDevs}}
     {{$devname}}: {{$netdev.Device}}
     {{$devname}}: {{$netdev.IpCIDR}}
-{{if $netdev.Ipaddr6 }}    {{$devname}}: {{$netdev.Ipaddr6}}{{ end }}
-{{if $netdev.Hwaddr }}    {{$devname}}: {{$netdev.Hwaddr}}{{ end }}
+{{if $netdev.Ipaddr6 }}    {{$devname}}: {{$netdev.Ipaddr6}}{{ end -}}
+{{if $netdev.Hwaddr }}    {{$devname}}: {{$netdev.Hwaddr}}{{ end -}}
 {{end}}
diff --git a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
index 363b2f5f..f3850a80 100644
--- a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
+++ b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
@@ -25,7 +25,7 @@ IPV6INIT=yes
 IPV6_AUTOCONF=yes
 IPV6_DEFROUTE=yes
 IPV6_FAILURE_FATAL=no
-{{ if $.NetDevs.default.Ipaddr6 -}}
-IPV6ADDR="{{ $.NetDevs.default.Ipaddr6 }}" 
+{{ if $netdev.Ipaddr6 -}}
+IPV6ADDR="{{ $netdev.Ipaddr6 }}" 
 {{ end -}}
 {{ end -}}
diff --git a/overlays/wwinit/etc/systemd/system/wwclient.service b/overlays/wwinit/etc/systemd/system/wwclient.service
index 4cc81927..6957bf7d 100644
--- a/overlays/wwinit/etc/systemd/system/wwclient.service
+++ b/overlays/wwinit/etc/systemd/system/wwclient.service
@@ -5,7 +5,7 @@ After=local-fs.target
 
 [Service]
 Type=notify
-ExecStart=/warewulf/bin/wwclient
+ExecStart=/warewulf/wwclient
 ExecReload=/bin/kill -s SIGHUP "$MAINPID"
 PIDFile=/var/run/wwclient.pid
 TimeoutSec=60
diff --git a/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww b/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
index 29277012..932731e9 100644
--- a/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
+++ b/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
@@ -38,10 +38,10 @@ Source: {{ $source }}
     <privacy>prefer-public</privacy>
     <accept-redirects>false</accept-redirects>
   </ipv6>
-{{ if $.NetDevs.default.Ipaddr6 -}}
+{{ if $netdev.Ipaddr6 -}}
   <ipv6:static>
     <address>
-      <local>{{ $.NetDevs.default.Ipaddr6 }}</local>
+      <local>{{ $netdev.Ipaddr6 }}</local>
     </address>
   </ipv6:static>
 {{ end -}}