diff --git a/src/hydsolver.c b/src/hydsolver.c
index d08076a..7e6f0d6 100644
--- a/src/hydsolver.c
+++ b/src/hydsolver.c
@@ -650,15 +650,21 @@ void  reporthydbal(EN_Project *pr, Hydbalance *hbal)
     double qchange = hbal->maxflowchange * pr->Ucf[FLOW];
     double herror = hbal->maxheaderror * pr->Ucf[HEAD];
     int    qlink = hbal->maxflowlink;
+    int    qnode = hbal->maxflownode;
     int    hlink = hbal->maxheadlink;
     if (qlink >= 1)
     {
         sprintf(pr->Msg, FMT66, qchange, pr->network.Link[qlink].ID);
         writeline(pr, pr->Msg);
     }
+    else if (qnode >= 1)
+    {
+        sprintf(pr->Msg, FMT67, qchange, pr->network.Node[qnode].ID);
+        writeline(pr, pr->Msg);
+    }
     if (hlink >= 1)
     {
-        sprintf(pr->Msg, FMT67, herror, pr->network.Link[hlink].ID);
+        sprintf(pr->Msg, FMT68, herror, pr->network.Link[hlink].ID);
         writeline(pr, pr->Msg);
     }
 }
diff --git a/src/inpfile.c b/src/inpfile.c
index f5ef6b8..0269bc5 100644
--- a/src/inpfile.c
+++ b/src/inpfile.c
@@ -618,9 +618,16 @@ int saveinpfile(EN_Project *pr, char *fname)
   fprintf(f, "\n CHECKFREQ           %-d", hyd->CheckFreq);
   fprintf(f, "\n MAXCHECK            %-d", hyd->MaxCheck);
   fprintf(f, "\n DAMPLIMIT           %-.8f", hyd->DampLimit);
-  fprintf(f, "\n HEADERROR           %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]);
-  fprintf(f, "\n FLOWCHANGE          %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]);
 
+  // New v.2.2 options - only add if not at default values
+  if (hyd->HeadErrorLimit > 0.0)
+  {
+    fprintf(f, "\n HEADERROR           %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]);
+  }
+  if (hyd->FlowChangeLimit > 0.0)
+  {
+    fprintf(f, "\n FLOWCHANGE          %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]);
+  }
   if (hyd->DemandModel == PDA)
   {
     fprintf(f, "\n DEMAND MODEL        PDA");
diff --git a/src/text.h b/src/text.h
index 4684fc8..0e2d9de 100755
--- a/src/text.h
+++ b/src/text.h
@@ -430,7 +430,8 @@ AUTHOR:     L. Rossman
 /*** End of update ***/
 
 #define FMT66  "                      maximum  flow change = %.4f for Link %s"
-#define FMT67  "                      maximum  head error  = %.4f for Link %s\n"
+#define FMT67  "                      maximum  flow change = %.4f for Node %s"
+#define FMT68  "                      maximum  head error  = %.4f for Link %s\n"
 
 /* -------------------- Energy Report Table ------------------- */
 #define FMT71  "Energy Usage:"