diff --git a/src/pairs/sim/comm.py b/src/pairs/sim/comm.py
index 5bd9e472c5e17000ae5f83bbb14affafc2d199cd..b2dd3c259968f282520d8c2b128be882aaa9aef5 100644
--- a/src/pairs/sim/comm.py
+++ b/src/pairs/sim/comm.py
@@ -199,7 +199,7 @@ class PackGhostParticles(Lowerable):
 
         step_indexes = self.comm.dom_part.step_indexes(self.step)
         start = self.comm.send_offsets[step_indexes[0]]
-        for i in For(self.sim, start, start + sum([self.comm.nsend[j] for j in step_indexes])):
+        for i in For(self.sim, start, BinOp.inline(start + sum([self.comm.nsend[j] for j in step_indexes]))):
             p_offset = 0
             m = send_map[i]
             for p in self.prop_list:
@@ -239,7 +239,7 @@ class UnpackGhostParticles(Lowerable):
 
         step_indexes = self.comm.dom_part.step_indexes(self.step)
         start = self.comm.recv_offsets[step_indexes[0]]
-        for i in For(self.sim, start, start + sum([self.comm.nrecv[j] for j in step_indexes])):
+        for i in For(self.sim, start, BinOp.inline(start + sum([self.comm.nrecv[j] for j in step_indexes]))):
             p_offset = 0
             for p in self.prop_list:
                 if p.type() == Types.Vector:
diff --git a/src/pairs/transformations/devices.py b/src/pairs/transformations/devices.py
index b77a0d45b818d33dfd56f6cb192df5d09cfa34c8..689a72c5ae1236866103f43dd80e64f85afe79b5 100644
--- a/src/pairs/transformations/devices.py
+++ b/src/pairs/transformations/devices.py
@@ -116,6 +116,9 @@ class AddHostReferencesToModules(Mutator):
 
         return ast_node
 
+    def mutate_Decl(self, ast_node):
+        return ast_node
+
     def mutate_HostRef(self, ast_node):
         return ast_node