Index: Makefile.in
===================================================================
diff -u -r77c096a7bfda22374422cc1bc2acbab6a2922d83 -rd6b5b0c4055205d54d3cffa4654b13da05aeb7ab
--- Makefile.in	(.../Makefile.in)	(revision 77c096a7bfda22374422cc1bc2acbab6a2922d83)
+++ Makefile.in	(.../Makefile.in)	(revision d6b5b0c4055205d54d3cffa4654b13da05aeb7ab)
@@ -812,7 +812,8 @@
 	@echo " In order install next-scripting, invoke:"
 	@echo "   make install"
 	@echo ""
-	@echo " In order to install next-scripting for AOLserver 4.x, invoke:"
+	@echo " In order to install next-scripting for AOLserver 4.x"
+	@echo " or Naviserver, invoke:"
 	@echo "   make install-aol"
 	@echo "" 
 	@echo " In order to invoke next-scripting interactively (before install), use:" 
Index: generic/nsf.c
===================================================================
diff -u -r0ebf98657723ea1cf08a3c60c6da4fcf7517a7b4 -rd6b5b0c4055205d54d3cffa4654b13da05aeb7ab
--- generic/nsf.c	(.../nsf.c)	(revision 0ebf98657723ea1cf08a3c60c6da4fcf7517a7b4)
+++ generic/nsf.c	(.../nsf.c)	(revision d6b5b0c4055205d54d3cffa4654b13da05aeb7ab)
@@ -7444,6 +7444,27 @@
 }
 
 /*
+ *----------------------------------------------------------------------
+ * FiltersDefined --
+ *
+ *    Return the number of defined distinct names of filters.
+ *
+ * Results:
+ *    Positive number.
+ *
+ * Side effects:
+ *    none.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+FiltersDefined(Tcl_Interp *interp) {
+  NsfRuntimeState *rst = RUNTIME_STATE(interp);
+  
+  return Tcl_HashSize(&rst->activeFilterTablePtr);
+}
+
+/*
  * append a filter command to the 'filterList' of an obj/class
  */
 static int
@@ -7992,7 +8013,9 @@
    * depended classes.
    */
   MixinInvalidateObjOrders(interp, cl);
-  FilterInvalidateObjOrders(interp, cl);
+  if (FiltersDefined(interp) > 0) {  
+    FilterInvalidateObjOrders(interp, cl);
+  }
 
   /* 
    * build an array of superclasses from the argument vector.
@@ -13940,7 +13963,9 @@
    * have no clopt...
    */
   MixinInvalidateObjOrders(interp, cl);
-  FilterInvalidateObjOrders(interp, cl);
+  if (FiltersDefined(interp) > 0) {  
+    FilterInvalidateObjOrders(interp, cl);
+  }
 
   if (clopt) {
     /*
@@ -19714,10 +19739,12 @@
 
       MixinInvalidateObjOrders(interp, cl);
       /*
-       * since mixin procs may be used as filters,
-       * we have to invalidate the filters as well
+       * Since methods of mixed in classes may be used as filters, we have to
+       * invalidate the filters as well.
        */
-      FilterInvalidateObjOrders(interp, cl);
+      if (FiltersDefined(interp) > 0) {  
+	FilterInvalidateObjOrders(interp, cl);
+      }
       clopt->classMixins = newMixinCmdList;
       for (i = 0; i < oc; i++) {
         Tcl_Obj *ocl = NULL;
@@ -19742,7 +19769,9 @@
     if (clopt->classFilters) {
       CmdListRemoveList(&clopt->classFilters, GuardDel);
     }
-    FilterInvalidateObjOrders(interp, cl);
+    if (FiltersDefined(interp) > 0) {  
+      FilterInvalidateObjOrders(interp, cl);
+    }
     for (i = 0; i < oc; i ++) {
       if (FilterAdd(interp, &clopt->classFilters, ov[i], 0, cl) != TCL_OK) {
         return TCL_ERROR;
Index: generic/nsfAccessInt.h
===================================================================
diff -u -ra09faeafaaacd8dcd4c52cdb86653993e8dc499a -rd6b5b0c4055205d54d3cffa4654b13da05aeb7ab
--- generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision a09faeafaaacd8dcd4c52cdb86653993e8dc499a)
+++ generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision d6b5b0c4055205d54d3cffa4654b13da05aeb7ab)
@@ -86,6 +86,10 @@
 #define TclVarHashTablePtr(varTablePtr)		&(varTablePtr)->table
 #define TclVarValue(type, varPtr, field)	(type *)(varPtr)->value.field
 
+#if !defined(Tcl_HashSize)
+# define Tcl_HashSize(tablePtr) ((tablePtr)->numEntries)
+#endif
+
 static NSF_INLINE Var *
 VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) {
   Var *varPtr = NULL;