diff --git a/C/save.c b/C/save.c
index 8b9ab9ec5..de1eefe85 100755
--- a/C/save.c
+++ b/C/save.c
@@ -685,8 +685,8 @@ check_header(CELL *info, CELL *ATrail, CELL *AStack, CELL *AHeap USES_REGS)
   if (strcmp(pp, msg) != 0) {
     LOCAL_ErrorMessage = LOCAL_ErrorSay;
     strncpy(LOCAL_ErrorMessage, "saved state ", MAX_ERROR_MSG_SIZE);
-    strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE);
-    strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE);
+    strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE-1);
+    strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE-1);
     LOCAL_Error_TYPE = CONSISTENCY_ERROR;
     return FAIL_RESTORE;
   }
diff --git a/packages/archive b/packages/archive
index 4445c093d..7984859c5 160000
--- a/packages/archive
+++ b/packages/archive
@@ -1 +1 @@
-Subproject commit 4445c093d08d0693899d8f3a3ac1b0842370d868
+Subproject commit 7984859c5739a7af6564fb890a28c32a98aa727e
diff --git a/packages/odbc b/packages/odbc
index 761bb9831..d9a8cdd6a 160000
--- a/packages/odbc
+++ b/packages/odbc
@@ -1 +1 @@
-Subproject commit 761bb9831f7221207949176de729711d0018e511
+Subproject commit d9a8cdd6ac472fa2338f7d66cc18e5e21f0ed94c