diff --git a/utils/he_ipv6/ra.py b/utils/he_ipv6/ra.py
index 62240e0..86e2a65 100644
--- a/utils/he_ipv6/ra.py
+++ b/utils/he_ipv6/ra.py
@@ -25,7 +25,7 @@ class RAConf(object):
         for k in ('name', 'dir'):
             n = 'tpl_{0}'.format(k)
             d = 'def_tpl_{0}'.format(k)
-            v = locals()[k]
+            v = locals()[n]
             if not v:
                 setattr(self, n, getattr(self, d))
             else:
diff --git a/utils/he_ipv6/tunnel.py b/utils/he_ipv6/tunnel.py
index 6b90486..b871e3d 100644
--- a/utils/he_ipv6/tunnel.py
+++ b/utils/he_ipv6/tunnel.py
@@ -101,7 +101,7 @@ class Assignment(object):
                           family = socket.AF_INET6,
                           scope = 253)[0]['attrs']
         addrs = dict(ll)['IFA_ADDRESS']
-        logger.debug('Link-Local address for {0}: {1}'.format(addrs, addrs))
+        logger.debug('Link-Local address for {0}: {1}'.format(self.iface, addrs))
         if isinstance(addrs, (list, tuple)):
             addr = addrs[0]
         else: