diff --git a/definitions/grib2/template.4.focalStatistics.def b/definitions/grib2/template.4.focalStatistics.def
index 8aa8d2a33..490919bbc 100644
--- a/definitions/grib2/template.4.focalStatistics.def
+++ b/definitions/grib2/template.4.focalStatistics.def
@@ -1,3 +1,4 @@
+# (C) Copyright 2005- ECMWF.
 codetable[1] spatialVicinityType ('4.103.table',masterDir,localDir)=255 ;
 
 unsigned[1]  numberOfSpatialVicinityValues = 1 : edition_specific;
diff --git a/definitions/grib2/template.4.radionuclides.def b/definitions/grib2/template.4.radionuclides.def
index 0e55346ab..c51ffa6c1 100644
--- a/definitions/grib2/template.4.radionuclides.def
+++ b/definitions/grib2/template.4.radionuclides.def
@@ -1,31 +1,23 @@
-codetable[2] transportModelUsed ('4.333.table',masterDir,localDir) : edition_specific;
+# (C) Copyright 2005- ECMWF
+
+codetable[2] transportModelUsed ('4.333.table',masterDir,localDir) = 255 : dump;
 
 codetable[2] requestedByEntity 'common/c-11.table' : dump,string_type;
 
-codetable[2] scenarioOrigin ('4.335.table',masterDir,localDir) : edition_specific;
+codetable[2] scenarioOrigin ('4.335.table',masterDir,localDir) = 255 : dump;
 
-codetable[2] NWPused ('4.336.table',masterDir,localDir) : edition_specific;
+codetable[2] NWPused ('4.336.table',masterDir,localDir) = 255 : dump;
 
-unsigned[2] releaseStartYear : edition_specific;
+unsigned[2] releaseStartYear : dump;
+unsigned[1] releaseStartMonth : dump;
+unsigned[1] releaseStartDay : dump;
+unsigned[1] releaseStartHour : dump;
+unsigned[1] releaseStartMinute : dump;
+unsigned[1] releaseStartSecond : dump;
 
-unsigned[1] releaseStartMonth : edition_specific;
-
-unsigned[1] releaseStartDay : edition_specific;
-
-unsigned[1] releaseStartHour : edition_specific;
-
-unsigned[1] releaseStartMinute : edition_specific;
-
-unsigned[1] releaseStartSecond : edition_specific;
-
-unsigned[2] WallClockInitialTimeOfExecutionYear : edition_specific;
-
-unsigned[1] WallClockInitialTimeOfExecutionMonth : edition_specific;
-
-unsigned[1] WallClockInitialTimeOfExecutionDay : edition_specific;
-
-unsigned[1] WallClockInitialTimeOfExecutionHour : edition_specific;
-
-unsigned[1] WallClockInitialTimeOfExecutionMinute : edition_specific;
-
-unsigned[1] WallClockInitialTimeOfExecutionSecond : edition_specific;
+unsigned[2] wallClockInitialTimeOfExecutionYear : dump;
+unsigned[1] wallClockInitialTimeOfExecutionMonth : dump;
+unsigned[1] wallClockInitialTimeOfExecutionDay : dump;
+unsigned[1] wallClockInitialTimeOfExecutionHour : dump;
+unsigned[1] wallClockInitialTimeOfExecutionMinute : dump;
+unsigned[1] wallClockInitialTimeOfExecutionSecond : dump;
diff --git a/definitions/grib2/template.4.referenceperiod.def b/definitions/grib2/template.4.referenceperiod.def
index 90c05351f..49a45d571 100644
--- a/definitions/grib2/template.4.referenceperiod.def
+++ b/definitions/grib2/template.4.referenceperiod.def
@@ -1,10 +1,11 @@
-#  Type of reference dataset
+# (C) Copyright 2005- ECMWF.
+# Type of reference dataset
 codetable[1] typeOfReferenceDataset ('4.100.table',masterDir,localDir) = 255 : dump,edition_specific;
 
-#  Type of relation to reference dataset
+# Type of relation to reference dataset
 codetable[1] typeOfRelationToReferenceDataset ('4.101.table',masterDir,localDir) = 255 : dump,edition_specific;
 
-# number of additional parameters
+# Number of additional parameters
 unsigned[1] numberOfAdditionalParametersForReferencePeriod=0 ;
 additionalParameter list(numberOfAdditionalParametersForReferencePeriod)
 {
@@ -32,7 +33,7 @@ meta startDateOfReferencePeriod g2date(yearOfStartOfReferencePeriod,monthOfStart
 
 unsigned[4] sampleSizeOfReferencePeriod = 0;
 
-#  n - number of time range specifications describing the time intervals used to calculate the statistically-processed field
+# Number of time range specifications describing the time intervals used to calculate the statistically-processed field
 unsigned[1]  numberOfReferencePeriodTimeRanges = 1 : edition_specific;
 alias nref = numberOfReferencePeriodTimeRanges;
 
diff --git a/definitions/grib2/template.4.reforecast.def b/definitions/grib2/template.4.reforecast.def
index f415ce80a..a8a431936 100644
--- a/definitions/grib2/template.4.reforecast.def
+++ b/definitions/grib2/template.4.reforecast.def
@@ -1,3 +1,4 @@
+# (C) Copyright 2005- ECMWF.
 # The Model Version Date
 # This is the date when the reforecast is produced with a particular version of the model
 
diff --git a/definitions/grib2/template.4.wave.def b/definitions/grib2/template.4.wave.def
index 37c3f4523..742c0ece4 100644
--- a/definitions/grib2/template.4.wave.def
+++ b/definitions/grib2/template.4.wave.def
@@ -1,3 +1,4 @@
+# (C) Copyright 2005- ECMWF.
 # Template for wave parameters
 
 ## Direction part
diff --git a/definitions/grib2/template.4.wave_period_range.def b/definitions/grib2/template.4.wave_period_range.def
index 3bd02fa4f..278ddf689 100644
--- a/definitions/grib2/template.4.wave_period_range.def
+++ b/definitions/grib2/template.4.wave_period_range.def
@@ -1,3 +1,4 @@
+# (C) Copyright 2005- ECMWF.
 # Template for wave parameters defined on a certain period range
 
 #  Type of period interval
diff --git a/definitions/grib2/template.4.wave_spectra_formula.def b/definitions/grib2/template.4.wave_spectra_formula.def
index c0893da1a..4a5e61fdd 100644
--- a/definitions/grib2/template.4.wave_spectra_formula.def
+++ b/definitions/grib2/template.4.wave_spectra_formula.def
@@ -1,3 +1,4 @@
+# (C) Copyright 2005- ECMWF.
 # Template for wave spectra defined using a formula for frequency and direction
 
 ## Direction part
diff --git a/definitions/grib2/template.4.wave_spectra_list.def b/definitions/grib2/template.4.wave_spectra_list.def
index 85fa6fc7d..ca7768604 100644
--- a/definitions/grib2/template.4.wave_spectra_list.def
+++ b/definitions/grib2/template.4.wave_spectra_list.def
@@ -1,3 +1,5 @@
+# (C) Copyright 2005- ECMWF.
+
 # Template for wave spectra defined using an array of frequencies and directions
 
 ## Direction part