diff --git a/share/metkit/modifiers.yaml b/share/metkit/modifiers.yaml
index 7bff9f30..5376e985 100644
--- a/share/metkit/modifiers.yaml
+++ b/share/metkit/modifiers.yaml
@@ -213,7 +213,7 @@
   defaults:
     number: [0]
 - context:
-    type: ['!', pf, cm, cs, cr, cv, sv, as, fp, ed, tu, ci, me, ff, icp, sot, fcmean, fcmax, fcmin, fcstdev, svar, gwt, bf, wp]
+    type: ['!', pf, cm, cs, cr, cv, sv, as, fp, ed, tu, ci, me, ff, icp, sot, fcmean, fcmax, fcmin, fcstdev, svar, gwt, gbf, bf, wp]
     class: ['!', ti, lw, s2]
     stream: ['!', mofc, wamf, mofm, wmfm, seas, wasf, wamf, sfmm, smma, seap, swmm, ocea, mnfc, mnfh, mnfa, mnfw, mfhw, mfaw, mnfm, mfhm, mfam, mfwm, mhwm, mawm, mmsf, msmm, wams, mswm, mmsa, enda, ewda, edmm, edmo, ewmm, ewmo, elda, ewla, espd, mmaf, mmam, mmaw, mmwm, seas, efsr, wfsr, efse, wfse, ocda]
   unset: [number]
diff --git a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
index bce5ba7d..189bdc9c 100644
--- a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
@@ -110,9 +110,9 @@ constexpr bool referenceTimeApplicable() {
 
     // Compile time conditions to apply this concept
     bool condition1 = (Variant == ReferenceTimeType::Standard || Variant == ReferenceTimeType::Reforecast) &&
-                      (Stage == StagePreset) && (Section == SecIdentificationSection);
+                      (Stage == StageRuntime) && (Section == SecIdentificationSection);
 
-    bool condition2 = (Variant == ReferenceTimeType::Reforecast) && (Stage == StagePreset) &&
+    bool condition2 = (Variant == ReferenceTimeType::Reforecast) && (Stage == StageRuntime) &&
                       (Section == SecProductDefinitionSection);
 
     // Confitions to apply concept