diff --git a/zUtil_Fit/gtFITParameters.m b/zUtil_Fit/gtFITParameters.m
index f554e2426d7600fbfc6d092bff870d8f96d0436f..85f06b4268fd8aa9921ce925a52fc196446b3592 100644
--- a/zUtil_Fit/gtFITParameters.m
+++ b/zUtil_Fit/gtFITParameters.m
@@ -508,13 +508,15 @@ end
 if any(activeglobal)
     [labgeo, detgeo, energy] = gtFitUpdateLabgeo(varsopt(1:sum(activeglobal)), ...
                        activeglobal, par.iniglobal, labgeo, detgeo);
-    labgeo = rmfield(labgeo, 'detnorm');
-    labgeo = rmfield(labgeo, 'detorig');
 else
     energy = par.iniglobal(10);
 end
-labgeo = rmfield(labgeo,'detnorm');
-labgeo = rmfield(labgeo,'detorig');
+if (isfield(labgeo, 'detnorm'))
+    labgeo = rmfield(labgeo,'detnorm');
+end
+if (isfield(labgeo, 'detorig'))
+    labgeo = rmfield(labgeo,'detorig');
+end
 
 % Drifts
 drift = par.drift;
diff --git a/zUtil_Fit/gtFitFwdSimGrains.m b/zUtil_Fit/gtFitFwdSimGrains.m
index f1eb90f91819b145ef28b7bb631824b4be1a8138..72181795cd2eff3822d985f4f3e36fb68ea72d88 100644
--- a/zUtil_Fit/gtFitFwdSimGrains.m
+++ b/zUtil_Fit/gtFitFwdSimGrains.m
@@ -135,7 +135,7 @@ for ii = 1:length(grain)
         
         % Absolute detector coordinates U,V in pixels
         uv = gtFedPredictUVMultiple(rot4, dveclab, gcsam, detgeo.detrefpos', ...
-            detgeo.detnorm, detgeo.Qdet, [detgeo.detrefu; detgeo.detrefv]);
+            detgeo.detnorm', detgeo.Qdet, [detgeo.detrefu; detgeo.detrefv]);
         
         
         % Absolute coordinates U,V,W (pixel,pixel,image); to account for
diff --git a/zUtil_Fit/gtFitSpotPosDeviations.m b/zUtil_Fit/gtFitSpotPosDeviations.m
index 2f851e0968d92f4ab6136dbf8cf0e5597e9b209c..25cd1617e3e1e609b354cd9dd546e8ec33d1a407 100644
--- a/zUtil_Fit/gtFitSpotPosDeviations.m
+++ b/zUtil_Fit/gtFitSpotPosDeviations.m
@@ -120,7 +120,7 @@ end
 %%% Update labgeo
 %%%%%%%%%%%%%%%%%%%%%%%%%
 
-[labgeo, detgeo] = gtGeoConvertLegacyLabgeo2Detgeo(par.labgeoini);
+[detgeo, labgeo] = gtGeoConvertLegacyLabgeo2Detgeo(par.labgeoini);
 % Recalculate labgeo
 if any(activeglobal)    
     [labgeo, detgeo, energy] = gtFitUpdateLabgeo( ...