diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py
index 050bf902c852a33f0023c8dcbd8d91ec7c11ff74..35aedb6fd12300c74675cfdc58248b4ba87adc7a 100644
--- a/cal_tools/cal_tools/agipdlib.py
+++ b/cal_tools/cal_tools/agipdlib.py
@@ -148,7 +148,7 @@ class AgipdCorrections:
     def __init__(self, max_cells, max_pulses,
                  h5_data_path="INSTRUMENT/SPB_DET_AGIPD1M-1/DET/{}CH0:xtdf/",
                  h5_index_path="INDEX/SPB_DET_AGIPD1M-1/DET/{}CH0:xtdf/",
-                 corr_bools={}):
+                 corr_bools: Optional[dict] = None):
         """
         Initialize an AgipdCorrections Class
 
@@ -194,6 +194,9 @@ class AgipdCorrections:
 
         """
 
+        if corr_bools is None:
+            corr_bools = {}
+
         # Data description
         self.h5_data_path = h5_data_path
         self.h5_index_path = h5_index_path
diff --git a/cal_tools/cal_tools/lpdlib.py b/cal_tools/cal_tools/lpdlib.py
index 054cebb74170bd7651cf65419efcacf7088e1f36..dbf86d33f3e8a9a3ec30ff973295df32d964dc5b 100644
--- a/cal_tools/cal_tools/lpdlib.py
+++ b/cal_tools/cal_tools/lpdlib.py
@@ -88,7 +88,7 @@ class LpdCorrections:
         self.do_ff = do_ff
         filter_modules = []
         self.filter_cells = [0, 1] if channel in filter_modules else []
-        self.cnl = True  # correct_non_linear
+        self.cnl = correct_non_linear
         self.karabo_data_mode = karabo_data_mode
         self.linear_between = linear_between
         self.mark_nonlin = mark_non_lin_region
diff --git a/cal_tools/cal_tools/metrology.py b/cal_tools/cal_tools/metrology.py
index 8a6c0affceb3151dc993e50e8972464cef978e57..6c7e807d9051b4078412ccf5d767f24e1cd5d14e 100644
--- a/cal_tools/cal_tools/metrology.py
+++ b/cal_tools/cal_tools/metrology.py
@@ -338,7 +338,7 @@ def returnPositioned2(geometry_file, modules, dquads):
         for i in range(numberOfTiles):
             # This is the top left corner of the tile with
             # respect to the top left corner of the supermodule
-            y0, x0 = bottomRightCornerCoordinates[i] + dquads[q]
+            y0, x0 = bottomRightCornerCoordinates[i] + dquads[q] - offset  # TODO: check subtraction of offsets works as expected
             x0 *= 2
             y0 *= 2
             td = tileData[i][:,:,:]