diff --git a/fast/diffusion_2D_wBCs.py b/fast/diffusion_2D_wBCs.py
index 869d6d2e7d2..0d19b7f733a 100644
--- a/fast/diffusion_2D_wBCs.py
+++ b/fast/diffusion_2D_wBCs.py
@@ -54,7 +54,7 @@
 eq_stencil = Eq(u.forward, stencil)
 
 if args.devito:
-    op = Operator([eq_stencil], name='DevitoOperator')
+    op = Operator([eq_stencil], name='DevitoOperator', opt=('advanced', {'par-tile': (32,4,8)}))
     op.apply(time=nt, dt=dt, a=nu)
     print("Devito Field norm is:", norm(u))
 
diff --git a/fast/diffusion_3D_wBCs.py b/fast/diffusion_3D_wBCs.py
index 9220e25247c..08b248c5ac1 100644
--- a/fast/diffusion_3D_wBCs.py
+++ b/fast/diffusion_3D_wBCs.py
@@ -80,7 +80,7 @@ def plot_3dfunc(u):
 
 # Create Operator
 if args.devito:
-    op = Operator([eq_stencil], name='DevitoOperator')
+    op = Operator([eq_stencil], name='DevitoOperator', opt=('advanced', {'par-tile': (32,4,8)}))
     # Apply the operator for a number of timesteps
     op.apply(time=nt, dt=dt, a=nu)
     print("Devito Field norm is:", norm(u))
diff --git a/fast/wave2d.py b/fast/wave2d.py
index 2a7855a6e95..3c60dc7c3bf 100644
--- a/fast/wave2d.py
+++ b/fast/wave2d.py
@@ -108,7 +108,6 @@
     if args.plot:
         plot_2dfunc(u)
 
-import pdb;pdb.set_trace()
 # print("Init Devito linalg norm 0 :", np.linalg.norm(u.data[0]))
 # print("Init Devito linalg norm 1 :", np.linalg.norm(u.data[1]))
 # print("Init Devito linalg norm 2 :", np.linalg.norm(u.data[2]))
@@ -120,7 +119,7 @@
 
 if args.devito:
     # Run more with no sources now (Not supported in xdsl)
-    op1 = Operator([stencil], name='DevitoOperator')
+    op1 = Operator([stencil], name='DevitoOperator', opt=('advanced', {'par-tile': (32,4,8)}))
     op1.apply(time=time_range.num-1, dt=model.critical_dt)
 
     configuration['mpi'] = 0
@@ -148,7 +147,7 @@
     # print("XDSL init linalg norm:", np.linalg.norm(u.data[2]))
 
     # Run more with no sources now (Not supported in xdsl)
-    xdslop = Operator([stencil], name='xDSLOperator')
+    xdslop = XDSLOperator([stencil], name='xDSLOperator')
     xdslop.apply(time=time_range.num-1, dt=model.critical_dt)
 
     if len(shape) == 2 and args.plot:
diff --git a/fast/wave3d.py b/fast/wave3d.py
index 86b0d55afe3..71602ca30f4 100644
--- a/fast/wave3d.py
+++ b/fast/wave3d.py
@@ -113,7 +113,7 @@
 configuration['mpi'] = mpiconf
 
 # Run more with no sources now (Not supported in xdsl)
-op1 = Operator([stencil], name='DevitoOperator')
+op1 = Operator([stencil], name='DevitoOperator', opt=('advanced', {'par-tile': (32,4,8)}))
 op1.apply(time=time_range.num-1, dt=model.critical_dt)
 
 configuration['mpi'] = 0