Index: library/mongodb/nsfmongo.c
===================================================================
diff -u -r6af35a888e33da976e283271bb68060f34d91a9a -r37c87756387c17e0f2f43634c0d452a91f91c844
--- library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision 6af35a888e33da976e283271bb68060f34d91a9a)
+++ library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
@@ -668,7 +668,7 @@
    * Make an entry in the symbol table and return entry name it as
    * result.
    */
-  if (Nsf_PointerAdd(interp, channelName, "mongoc_client_t", clientPtr) != TCL_OK) {
+  if (Nsf_PointerAdd(interp, channelName, 80u, "mongoc_client_t", clientPtr) != TCL_OK) {
     mongoc_client_destroy(clientPtr);
     return TCL_ERROR;
   }
@@ -761,7 +761,7 @@
   if (collectionPtr != NULL) {
     char buffer[80];
 
-    if (Nsf_PointerAdd(interp, buffer, "mongoc_collection_t", collectionPtr) == TCL_OK) {
+    if (Nsf_PointerAdd(interp, buffer, 80u, "mongoc_collection_t", collectionPtr) == TCL_OK) {
       Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
       result = TCL_OK;
     } else {
@@ -1191,7 +1191,7 @@
   if (cursor != NULL) {
     char buffer[80];
 
-    if (Nsf_PointerAdd(interp, buffer, "mongoc_cursor_t", cursor) == TCL_OK) {
+    if (Nsf_PointerAdd(interp, buffer, 80u, "mongoc_cursor_t", cursor) == TCL_OK) {
       Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
     } else {
       mongoc_cursor_destroy( cursor );
@@ -1251,7 +1251,7 @@
 
   if (cursor != NULL) {
     char buffer[80];
-    if (Nsf_PointerAdd(interp, buffer, "mongoc_cursor_t", cursor) == TCL_OK) {
+    if (Nsf_PointerAdd(interp, buffer, 80u, "mongoc_cursor_t", cursor) == TCL_OK) {
       Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
     } else {
       mongoc_cursor_destroy( cursor );
@@ -1343,7 +1343,7 @@
     result = NsfPrintError(interp, "mongo::gridfs::open: error: %s", bsonError.message);
   }
 
-  if (Nsf_PointerAdd(interp, buffer, "mongoc_gridfs_t", gfsPtr) == TCL_OK) {
+  if (Nsf_PointerAdd(interp, buffer, 80u, "mongoc_gridfs_t", gfsPtr) == TCL_OK) {
     Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
   } else {
     mongoc_gridfs_destroy(gfsPtr);
@@ -1552,7 +1552,7 @@
   if (gridFilePtr != NULL) {
     char buffer[80];
 
-    if (Nsf_PointerAdd(interp, buffer, "mongoc_gridfs_file_t", gridFilePtr) == TCL_OK) {
+    if (Nsf_PointerAdd(interp, buffer, 80u, "mongoc_gridfs_file_t", gridFilePtr) == TCL_OK) {
       Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
     } else {
       mongoc_gridfs_file_destroy(gridFilePtr);