Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -rab21c8502870e715c567c657146283699e31b01b -r3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision ab21c8502870e715c567c657146283699e31b01b)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4)
@@ -1006,6 +1006,7 @@
 },
 {"::mongo::status", NsfMongoStatusStub, 1, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Pointer, NULL,NULL,"mongoc_client_t",NULL,NULL,NULL,NULL,NULL}}
-},{NULL}
+},
+{NULL, NULL, 0, {{NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}}
 };
 
Index: library/mongodb/nsfmongo.c
===================================================================
diff -u -rb7029a446ac0be8caf5c230a7d022e72426040d3 -r3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4
--- library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision b7029a446ac0be8caf5c230a7d022e72426040d3)
+++ library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision 3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4)
@@ -93,18 +93,18 @@
 
 #define PARSE_CONTEXT_PREALLOC 20
 typedef struct {
-  int status;
-  ClientData *clientData; /* 4 members pointer to the actual parse context data */
-  Tcl_Obj **objv;
-  Tcl_Obj **full_objv;    /* contains method as well */
-  int *flags;
-  ClientData clientData_static[PARSE_CONTEXT_PREALLOC]; /* 3 members preallocated parse context data */
-  Tcl_Obj *objv_static[PARSE_CONTEXT_PREALLOC+1];
-  int flags_static[PARSE_CONTEXT_PREALLOC+1];
-  int lastObjc;           /* points to the first "unprocessed" argument */
-  int objc;
-  int varArgs;            /* does the parameter end with some kind of "args" */
-  NsfObject *object;
+  ClientData   *clientData;   /* 4 members pointer to the actual parse context data */
+  Tcl_Obj     **objv;
+  Tcl_Obj     **full_objv;    /* contains method as well */
+  unsigned int *flags;
+  ClientData    clientData_static[PARSE_CONTEXT_PREALLOC]; /* 3 members preallocated parse context data */
+  Tcl_Obj      *objv_static[PARSE_CONTEXT_PREALLOC+1];
+  unsigned int  flags_static[PARSE_CONTEXT_PREALLOC+1];
+  unsigned int  status;
+  int           lastObjc;     /* points to the first "unprocessed" argument */
+  int           objc;
+  NsfObject    *object;
+  int           varArgs;      /* does the parameter end with some kind of "args" */
 } ParseContext;
 
 #define nr_elements(arr)  ((int) (sizeof(arr) / sizeof(arr[0])))