diff --git a/client.c b/client.c
index 77bdd42..6356684 100644
--- a/client.c
+++ b/client.c
@@ -1082,12 +1082,11 @@ process_cmd_delete(CMD_Request *msg, char *line)
       fprintf(stderr, "Could not get address for hostname\n");
       ok = 0;
     } else {
+      UTI_IPHostToNetwork(&address, &msg->data.del_source.ip_addr);
       ok = 1;
     }
   }
 
-  UTI_IPHostToNetwork(&address, &msg->data.del_source.ip_addr);
-
   return ok;
   
 }
diff --git a/manual.c b/manual.c
index 93a9617..c3f7797 100644
--- a/manual.c
+++ b/manual.c
@@ -145,6 +145,8 @@ estimate_and_set_system(struct timeval *now, int offset_provided, double offset,
     }
     b1 = freq = 0.0;
     found_freq = 0;
+    agos[0] = 0.0;
+    offsets[0] = b0;
   }
 
   if (offset_provided) {