diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m
index 7a44159709e5a38cfb84de891f0c5dce1b076acb..1b2443b51317d08b96b21b43edde05d1d488cffe 100644
--- a/tsg_io/readTsgDataLabview.m
+++ b/tsg_io/readTsgDataLabview.m
@@ -153,6 +153,7 @@ if fid ~= -1
       tsg.LONX       = lon(noNaN);
       tsg.SSJT       = sst(noNaN);
       tsg.SSPS       = sss(noNaN);
+      tsg.CNDC       = cond(noNaN);
       tsg.SPDC       = sog(noNaN);
       tsg.SSJT_FREQ  = tsg.SSJT_FREQ(noNaN);
       tsg.CNDC_FREQ  = tsg.CNDC_FREQ(noNaN);
diff --git a/tsg_util/calibration.m b/tsg_util/calibration.m
index 8ff58104e14e39de5448318a17665024da3c4278..d79bdd5d9b6df8d3ea2ea14d538d62563ef0c8c2 100644
--- a/tsg_util/calibration.m
+++ b/tsg_util/calibration.m
@@ -13,6 +13,7 @@ else
   msgbox( 'Conductivity not loaded',...
           'Function ''Calibration''',...
           'warn', 'modal');
+  return
 end
 
 if ~isempty( tsg.SSJT )
@@ -21,6 +22,7 @@ else
   msgbox( 'Jacket temperature not loaded',...
           'Function ''Calibration''',...
           'warn', 'modal');
+  return
 end
 
 % Compute salinity - Use CSIRO functions
diff --git a/tsg_util/plot_Correction.m b/tsg_util/plot_Correction.m
index 233b52603a8472b63e062aad1d9a99e2a6aa8240..f1e5f9cf9b29723412a17c3971f23ad0934a8e7e 100644
--- a/tsg_util/plot_Correction.m
+++ b/tsg_util/plot_Correction.m
@@ -37,6 +37,8 @@ VALUE_CHANGED = get(tsg.qc.hash, 'VALUE_CHANGED', 'code');
 indVC = find( tsg.SSPS_ADJUSTED_QC == VALUE_CHANGED);
 
 % Plot the difference tsg.SSPS_ADJUSTED-tsg.SSPS on axe 1
+% but only for records that were corrected using Water Sample
+% and not corrected with the calibration coefficients
 % -------------------------------------------------------
 plot_Tsg( hMainFig, hPlotAxes, 1,...
           tsg.DAYD(indVC), tsg.SSPS_ADJUSTED(indVC)-tsg.SSPS(indVC),...