diff --git a/matlab/JET/gdat_jet.m b/matlab/JET/gdat_jet.m
index c38adeed9ba2b35f9be33392df5002b2f5ad68c2..dff583deaa4786b180f2edbc777ddb091efc6e02 100644
--- a/matlab/JET/gdat_jet.m
+++ b/matlab/JET/gdat_jet.m
@@ -1370,7 +1370,7 @@ elseif strcmp(mapping_for_jet.method,'switchcase')
     gdat_data.dimunits{1} = 's';
     gdat_data.data = rad.data;
     gdat_data.units = 'W';
-    gdat_data.data_fullpath = params_eff.data_request;
+    gdat_data.data_fullpath = rad.gdat_params.data_request;
 
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    case {'psi_edge'}
diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 76332c00187d360270dd05db09ebfb17716b57a6..dc32e85659f2cf21c329b509e450aa8f0b96e857 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1983,6 +1983,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       if isempty(tracetdi.data) || isempty(tracetdi.dim) || ischar(tracetdi.data)
         if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
       else
+        ij=[~isfinite(tracetdi.data)]; tracetdi.data(ij)=0.;
         gdat_data.ec.data = tracetdi.data*1e3; % at this stage p_gyro is in kW'
         gdat_data.ec.units = 'W';
         gdat_data.ec.dim=tracetdi.dim;
@@ -2021,7 +2022,8 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         nbh_data_tdi = tdi(nodenameeff);
         if ~isempty(nbh_data_tdi.data) && ~ischar(nbh_data_tdi.data) && ~isempty(nbh_data_tdi.dim)
           nbi_neutral_power_tot = nbh_data_tdi.data.*1e6; % in W
-          nbi_neutral_power_tot = max(nbi_neutral_power_tot,0.);
+          ij = nbi_neutral_power_tot<100;
+          nbi_neutral_power_tot(ij) = 0.;
           gdat_data.nbi.data = nbi_neutral_power_tot; % at this stage p_gyro is in kW'
           gdat_data.nbi.units = 'W';
           gdat_data.nbi.dim{1}=nbh_data_tdi.dim{1};