diff --git a/pfb/operators/gridder.py b/pfb/operators/gridder.py
index 7843e18a7..7c1551e8c 100644
--- a/pfb/operators/gridder.py
+++ b/pfb/operators/gridder.py
@@ -649,8 +649,8 @@ def image_data_products(uvw,
         uvw=uvw,
         freq=freq,
         vis=vis,
-        wgt=wgt,
-        # wgt=imwgt,  # data already naturally weighted
+        # wgt=wgt,
+        wgt=imwgt,  # data already naturally weighted
         mask=mask,
         npix_x=nx, npix_y=ny,
         pixsize_x=cellx, pixsize_y=celly,
diff --git a/pfb/utils/stokes.py b/pfb/utils/stokes.py
index c94a86063..cd8bf690b 100644
--- a/pfb/utils/stokes.py
+++ b/pfb/utils/stokes.py
@@ -344,15 +344,15 @@ def stokes_funcs(data, jones, product, pol):
                        [0, 1.0, 1.0j, 0],
                        [0, 1.0, -1.0j, 0],
                        [1.0, 0, 0, -1.0]])
-    Tinv = T.inv()
+    # Tinv = T.inv()
 
     # Full Stokes weights
     W = T.H * Mpq.H * Sinv * Mpq * T
-    Winv = Tinv * Mpqinv * S * Mpqinv.H * Tinv.H
+    # Winv = Tinv * Mpqinv * S * Mpqinv.H * Tinv.H
 
     # Full Stokes coherencies
-    C = Winv * (T.H * (Mpq.H * (Sinv * Vpq)))
-    # C = T.H * (Mpq.H * (Sinv * Vpq))
+    # C = Winv * (T.H * (Mpq.H * (Sinv * Vpq)))
+    C = T.H * (Mpq.H * (Sinv * Vpq))
 
     if product == literal('I'):
         i = 0