diff --git a/modules/70_water/heat/declarations.gms b/modules/70_water/heat/declarations.gms
index f8ce0392c..78c34620b 100644
--- a/modules/70_water/heat/declarations.gms
+++ b/modules/70_water/heat/declarations.gms
@@ -19,7 +19,7 @@ p70_cap_vintages(ttot, all_regi, all_te, ttot2)                 "capacity build
 p70_cap_vintages_share(ttot, all_regi, all_te, ttot2)           "fraction of capacity build in ttot2 still standing in ttot out of total capacity in ttot. Unit: 0-1"
 p70_heat(ttot,all_regi,all_enty,all_enty,all_te)                "excess heat. Unit: TWa"
 p70_water_con(all_regi, all_te, coolte70)                       "water consumption coefficients per excess heat. Unit: m3/MWh"
-p70_water_wtd(all_regi, all_te, coolte70)                       "water withdrawal coefficients per excess heat. Unit: m3/MWh)"
+p70_water_wtd(all_regi, all_te, coolte70)                       "water withdrawal coefficients per excess heat. Unit: m3/MWh"
 
 p70_water_output(ttot,all_regi,descr_water_ext)                          "output"
 
diff --git a/output.R b/output.R
index b02726cae..c7784266d 100755
--- a/output.R
+++ b/output.R
@@ -279,7 +279,7 @@ if (comp %in% c("comparison", "export")) {
 
     # output creation for --testOneRegi was switched off in start.R in this commit:
     # https://github.com/remindmodel/remind/commit/5905d9dd814b4e4a62738d282bf1815e6029c965
-    if (all(is.na(output)) || output == "NA") {
+    if (all(output %in% c(NA, "NA"))) {
       message("\nNo output generation, as output was set to NA, as for example for --testOneRegi or --quick.")
     } else {
       message("\nStarting output generation for ", outputdir, "\n")