diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd4ee5bb..70ac2065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [Unreleased]
 ### Changed
 * [672](https://github.com/dbekaert/RAiDER/pull/672) - Linted the project with `ruff`.
+* [683](https://github.com/dbekaert/RAiDER/pull/683) - Fixed a naive datetime and added default template to template generation argument
 
 ### Fixed
 * [679](https://github.com/dbekaert/RAiDER/pull/679) - Fixed a bug causing test_updateTrue to falsely pass.
diff --git a/tools/RAiDER/cli/raider.py b/tools/RAiDER/cli/raider.py
index ced83c26..2bc74b65 100644
--- a/tools/RAiDER/cli/raider.py
+++ b/tools/RAiDER/cli/raider.py
@@ -182,17 +182,19 @@ def calcDelays(iargs: Optional[Sequence[str]]=None) -> list[Path]:
 
     # Generate an example configuration file, OR
     # run with a configuration file.
-    group = p.add_mutually_exclusive_group(required=True)
+    group = p.add_mutually_exclusive_group(required=False)
     group.add_argument(
         '--generate_config',
         '-g',
         nargs='?',
+        const='template',
         choices=[
             'template',
             'example_LA_bbox',
             'example_LA_GNSS',
             'example_UK_isce',
         ],
+        default='template',
         help='Generate an example run configuration and exit',
     )
     group.add_argument(
diff --git a/tools/RAiDER/models/hres.py b/tools/RAiDER/models/hres.py
index 926b09e7..45c0d1e0 100755
--- a/tools/RAiDER/models/hres.py
+++ b/tools/RAiDER/models/hres.py
@@ -79,7 +79,7 @@ def _fetch(self, out) -> None:
         lat_min, lat_max, lon_min, lon_max = self._ll_bounds
         time = self._time
 
-        if time < dt.datetime(2013, 6, 26, 0, 0, 0):
+        if time < dt.datetime(2013, 6, 26, 0, 0, 0).replace(tzinfo=dt.timezone(offset=dt.timedelta())):
             self.update_a_b()
 
         # execute the search at ECMWF