diff --git a/juniper-macros.j2 b/juniper-macros.j2
index 5862809..0816579 100644
--- a/juniper-macros.j2
+++ b/juniper-macros.j2
@@ -55,7 +55,7 @@ system {
 chassis {
     aggregated-devices {
         ethernet {
-            device-count {{ device['interfaces']|selectattr('type','eq','LAG')|list|count }};
+            device-count {{ device.interfaces.all()|selectattr('type','eq','lag')|list|count }};
         }
     }
 {% if breakout_ports %}
@@ -320,13 +320,13 @@ routing-options {
 {% macro vlanssection(vlans,device) %}
 vlans {
 {# This next line selects all of the VLANs which are configured on this device #}
-{% for vlan in vlans if (device['interfaces']|selectattr('untagged_vlan.vid','equalto',vlan)|list|count or interfaces|map(attribute='tagged_vlans')|sum(start=[])|selectattr('vid','equalto',vlan)|list|count) or device['interfaces']|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
+{% for vlan in vlans if (device.interfaces.all()|selectattr('untagged_vlan.vid','equalto',vlan)|list|count or interfaces|map(attribute='tagged_vlans')|sum(start=[])|selectattr('vid','equalto',vlan)|list|count) or device.interfaces.all()|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
     vl{{ vlan['vid'] }} {
 {% if vlan['name'] != '' %}
         description "{{ vlan['name'] }}";
 {% endif %}
         vlan-id {{ vlan['vid'] }};
-{% if device['interfaces']|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
+{% if device.interfaces.all()|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
         l3-interface irb.{{vlan['vid']}};
 {% endif %}
         vxlan {