diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index bfccd2e7dfe22fc285b78334a5c39f16e918d78a..d1bd203418114674ee34b961d93785a637338eee 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.9 2000/04/18 06:53:53 jonasw Exp $");
+RCSID("$Id: gdbmmod.c,v 1.10 2000/07/07 14:02:12 grubba Exp $");
 #include "gdbm_machine.h"
 #include "threads.h"
 
@@ -30,7 +30,7 @@ struct gdbm_glue
   GDBM_FILE dbf;
 };
 
-#define THIS ((struct gdbm_glue *)(fp->current_storage))
+#define THIS ((struct gdbm_glue *)(Pike_fp->current_storage))
 
 static void do_free(void)
 {
@@ -117,7 +117,7 @@ static void gdbmmod_create(INT32 args)
     mt_unlock(& gdbm_lock);
     THREADS_DISALLOW();
 
-    if(!fp->current_object->prog)
+    if(!Pike_fp->current_object->prog)
     {
       if(tmp) gdbm_close(tmp);
       error("Object destructed in gdbm->open()n");
diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 9dba4005708865769fd8f2505571b1794e40320d..cb4cf1ef93839c5f1a0fba2374cf0e4275aeffae 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: zlibmod.c,v 1.27 1999/08/20 20:04:31 grubba Exp $");
+RCSID("$Id: zlibmod.c,v 1.28 2000/07/07 14:01:59 grubba Exp $");
 
 #include "zlib_machine.h"
 
@@ -41,7 +41,7 @@ struct zipper
 #define MAX_BUF	(64*BUF)
 
 #undef THIS
-#define THIS ((struct zipper *)(fp->current_storage))
+#define THIS ((struct zipper *)(Pike_fp->current_storage))
 
 static void gz_deflate_create(INT32 args)
 {
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 42bd5bc975ae2922e0f106e98b7f35345427136f..568059b9c00dcdc88ce86aeabb80740d1c63581c 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.41 2000/06/11 21:07:21 per Exp $ */
+/* $Id: blit.c,v 1.42 2000/07/07 13:56:45 grubba Exp $ */
 #include "global.h"
 
 /*
 **! module Image
 **! note
-**!	$Id: blit.c,v 1.41 2000/06/11 21:07:21 per Exp $
+**!	$Id: blit.c,v 1.42 2000/07/07 13:56:45 grubba Exp $
 **! class Image
 */
 
@@ -33,8 +33,8 @@ extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
 #endif
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define absdiff(a,b) ((a)<(b)?((b)-(a)):((a)-(b)))
 
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index 10dda6f78423cdd362c9c6734531eafab37278b4..46960e00c0f15ea605011ac834e559a4ab7c1527 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: colors.c,v 1.30 2000/02/03 19:02:22 grubba Exp $
+**!	$Id: colors.c,v 1.31 2000/07/07 13:56:45 grubba Exp $
 **! submodule Color
 **!
 **!	This module keeps names and easy handling 
@@ -179,7 +179,7 @@
 
 #include "global.h"
 
-RCSID("$Id: colors.c,v 1.30 2000/02/03 19:02:22 grubba Exp $");
+RCSID("$Id: colors.c,v 1.31 2000/07/07 13:56:45 grubba Exp $");
 
 #include "image_machine.h"
 
@@ -314,8 +314,8 @@ static void make_colors(void)
 #ifdef THIS
 #undef THIS /* Needed for NT */
 #endif
-#define THIS ((struct color_struct*)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct color_struct*)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 static void init_color_struct(struct object *dummy)
 {
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 9beec51f77f93aa1e41c84d4012e603453ee8f39..cb99b041b815256e2b05d76c80d88e4bf67dd65d 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,11 @@
 #include "global.h"
 
-/* $Id: colortable.c,v 1.77 1999/10/30 11:51:41 mirar Exp $ */
+/* $Id: colortable.c,v 1.78 2000/07/07 13:56:45 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.77 1999/10/30 11:51:41 mirar Exp $
+**!	$Id: colortable.c,v 1.78 2000/07/07 13:56:45 grubba Exp $
 **! class Colortable
 **!
 **!	This object keeps colortable information,
@@ -20,7 +20,7 @@
 #undef COLORTABLE_DEBUG
 #undef COLORTABLE_REDUCE_DEBUG
 
-RCSID("$Id: colortable.c,v 1.77 1999/10/30 11:51:41 mirar Exp $");
+RCSID("$Id: colortable.c,v 1.78 2000/07/07 13:56:45 grubba Exp $");
 
 #include <math.h> /* fabs() */
 
@@ -80,8 +80,8 @@ static INLINE int sq(int x) { return x*x; }
 #ifdef THIS
 #undef THIS /* Needed for NT */
 #endif
-#define THIS ((struct neo_colortable *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct neo_colortable *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 static struct pike_string *s_array;
 static struct pike_string *s_string;
@@ -577,13 +577,14 @@ static int reduce_recurse(struct nct_flat_entry *src,
 #endif
 
       n=reduce_recurse(src,dest,left,i,level+2,sf,newpos1,space,type);
-      if (n!=oldn) 
+      if (n!=oldn) {
 	 if (n<oldn) /* i certainly hope so */
 	    MEMMOVE(dest+n,dest+oldn,sizeof(struct nct_flat_entry)*m);
 	 else /* huh? */
 	    /* this is the only case we don't have them already */
 	    m=reduce_recurse(src+left,dest+n,src_size-left,
 			     target_size-n,level+2,sf,newpos2,space,type);
+      }
 #ifdef COLORTABLE_REDUCE_DEBUG
       fprintf(stderr,"COLORTABLE%*s ->%d+%d=%d (retried for %d+%d=%d)\n",level,"",n,m,n+m,i,target_size-i,target_size);
 #endif
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index f7c3591516d076f0a5f855449458b42bc272b79f..ab548ba4ad6ea03d5196aed198270e8384bea186 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.58 2000/03/25 23:34:32 hubbe Exp $ */
+/* $Id: font.c,v 1.59 2000/07/07 13:56:45 grubba Exp $ */
 #include "global.h"
 
 #define SPACE_CHAR 'i'
@@ -9,7 +9,7 @@ extern unsigned char * image_default_font;
 /*
 **! module Image
 **! note
-**!	$Id: font.c,v 1.58 2000/03/25 23:34:32 hubbe Exp $
+**!	$Id: font.c,v 1.59 2000/07/07 13:56:45 grubba Exp $
 **! class Font
 **!
 **! note
@@ -189,8 +189,8 @@ extern struct program *font_program;
 extern struct program *image_program;
 
 #undef THIS
-#define THIS (*(struct font **)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS (*(struct font **)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 struct font 
 {
@@ -560,7 +560,7 @@ void font_write(INT32 args)
    p_wchar2 *to_write2;
    int to_write_len;
    INT32 c;
-   struct font *this = (*(struct font **)(fp->current_storage));
+   struct font *this = (*(struct font **)(Pike_fp->current_storage));
    if (!this)
       error("font->write: no font loaded\n");
 
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 48b01d681464c5ab55b25d2a1180bd11064b3ae0..fe75cb832da27c386492305c6f0b922b5027be03 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.163 2000/06/05 03:04:10 mast Exp $ */
+/* $Id: image.c,v 1.164 2000/07/07 13:56:45 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: image.c,v 1.163 2000/06/05 03:04:10 mast Exp $
+**!	$Id: image.c,v 1.164 2000/07/07 13:56:45 grubba Exp $
 **! class Image
 **!
 **!	The main object of the <ref>Image</ref> module, this object
@@ -98,7 +98,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.163 2000/06/05 03:04:10 mast Exp $");
+RCSID("$Id: image.c,v 1.164 2000/07/07 13:56:45 grubba Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -126,8 +126,8 @@ extern struct program *image_colortable_program;
 #undef THIS /* Needed for NT */
 #endif
 
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define testrange(x) ((COLORTYPE)MAXIMUM(MINIMUM(((int)x),255),0))
 
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index 2caa74fd75fa34b3f1aa2f0bdd6fe7409100f3c8..4c77a16eef5e570e656a079e20d2c9f2c8fa46f2 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,9 +1,9 @@
-/* $Id: matrix.c,v 1.22 2000/04/09 06:15:17 per Exp $ */
+/* $Id: matrix.c,v 1.23 2000/07/07 13:56:46 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: matrix.c,v 1.22 2000/04/09 06:15:17 per Exp $
+**!	$Id: matrix.c,v 1.23 2000/07/07 13:56:46 grubba Exp $
 **! class Image
 */
 
@@ -30,8 +30,8 @@ extern struct program *image_program;
 #undef THIS /* Needed for NT */
 #endif
 
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #if 0
 #include <sys/resource.h>
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index ff51acd804c86747c6bb223d5b81c3e1dc5537b5..db21c8e6b03d1712140fcbc03f187b3446743c86 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,9 +1,9 @@
-/* $Id: operator.c,v 1.28 2000/06/03 21:01:16 per Exp $ */
+/* $Id: operator.c,v 1.29 2000/07/07 13:56:46 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: operator.c,v 1.28 2000/06/03 21:01:16 per Exp $
+**!	$Id: operator.c,v 1.29 2000/07/07 13:56:46 grubba Exp $
 **! class Image
 */
 
@@ -32,8 +32,8 @@ extern struct program *image_program;
 #ifdef THIS
 #undef THIS
 #endif
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define absdiff(a,b) ((a)<(b)?((b)-(a)):((a)-(b)))
 
diff --git a/src/modules/Image/orient.c b/src/modules/Image/orient.c
index 565e0be18478976738b8aeab331975924b2c16c6..185f9dded3e5e70b8b63d4057ffd72fa4525d0fe 100644
--- a/src/modules/Image/orient.c
+++ b/src/modules/Image/orient.c
@@ -1,9 +1,9 @@
-/* $Id: orient.c,v 1.13 1999/06/19 20:24:48 hubbe Exp $ */
+/* $Id: orient.c,v 1.14 2000/07/07 13:56:46 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: orient.c,v 1.13 1999/06/19 20:24:48 hubbe Exp $
+**!	$Id: orient.c,v 1.14 2000/07/07 13:56:46 grubba Exp $
 **! class Image
 */
 
@@ -31,8 +31,8 @@ extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
 #endif
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define testrange(x) MAXIMUM(MINIMUM((x),255),0)
 
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index 4515dea4ea0fd50e7efbc3eff7aa1e01cc9571fe..e6812dfc924df28f190f13902c4bc08ba5561b4e 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,9 +1,9 @@
-/* $Id: pattern.c,v 1.18 1999/07/16 11:44:20 mirar Exp $ */
+/* $Id: pattern.c,v 1.19 2000/07/07 13:56:46 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: pattern.c,v 1.18 1999/07/16 11:44:20 mirar Exp $
+**!	$Id: pattern.c,v 1.19 2000/07/07 13:56:46 grubba Exp $
 **! class Image
 */
 
@@ -31,8 +31,8 @@ extern struct program *image_program;
 #undef THIS
 #endif
 
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define testrange(x) MAXIMUM(MINIMUM((x),255),0)
 
diff --git a/src/modules/Image/poly.c b/src/modules/Image/poly.c
index 0361a50e1b27f42041094f1a4e06290f6ee56bd9..054ba1b1c8bd25217bbc1a97271b67e6984d4c6f 100644
--- a/src/modules/Image/poly.c
+++ b/src/modules/Image/poly.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: poly.c,v 1.3 1999/07/28 09:26:20 mirar Exp $
+**!	$Id: poly.c,v 1.4 2000/07/07 13:56:46 grubba Exp $
 **! class Poly
 **!
 */
@@ -18,7 +18,7 @@ another?
 
 #include "global.h"
 
-RCSID("$Id: poly.c,v 1.3 1999/07/28 09:26:20 mirar Exp $");
+RCSID("$Id: poly.c,v 1.4 2000/07/07 13:56:46 grubba Exp $");
 
 #include "image_machine.h"
 
@@ -52,8 +52,8 @@ RCSID("$Id: poly.c,v 1.3 1999/07/28 09:26:20 mirar Exp $");
 #ifdef THIS
 #undef THIS
 #endif
-#define THIS ((struct poly *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct poly *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 struct poly
 {
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 97a769e893b8daa837a0f7c6631e000d86275c0e..259b05badf83b196d6cc966247fcd0fe7629dde1 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: polyfill.c,v 1.30 1999/06/19 20:24:49 hubbe Exp $");
+RCSID("$Id: polyfill.c,v 1.31 2000/07/07 13:56:46 grubba Exp $");
 
 /* Prototypes are needed for these */
 extern double floor(double);
@@ -29,15 +29,15 @@ extern double floor(double);
 #ifdef THIS
 #undef THIS
 #endif
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #undef POLYDEBUG
 
 /*
 **! module Image
 **! note
-**!	$Id: polyfill.c,v 1.30 1999/06/19 20:24:49 hubbe Exp $
+**!	$Id: polyfill.c,v 1.31 2000/07/07 13:56:46 grubba Exp $
 **! class Image
 */
 
diff --git a/src/modules/Image/search.c b/src/modules/Image/search.c
index 8261a55b6db7e2b3853387db2071f87c0384b64c..023d79eb37659ad3705f1cc0ca33c5b1e2d67b4c 100644
--- a/src/modules/Image/search.c
+++ b/src/modules/Image/search.c
@@ -30,8 +30,8 @@ extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
 #endif
-#define THIS ((struct image *)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct image *)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 #define testrange(x) MAXIMUM(MINIMUM((x),255),0)
 
diff --git a/src/modules/Math/math_matrix.c b/src/modules/Math/math_matrix.c
index 76e3dbcb1477ba32ab44ee55bf60f47a67d22efd..51a8545a8dfefffd20ec01c32597ccea0a887ea8 100644
--- a/src/modules/Math/math_matrix.c
+++ b/src/modules/Math/math_matrix.c
@@ -1,4 +1,4 @@
-/* $Id: math_matrix.c,v 1.12 1999/11/08 22:39:28 grubba Exp $ */
+/* $Id: math_matrix.c,v 1.13 2000/07/07 14:01:16 grubba Exp $ */
 
 #include "global.h"
 #include "config.h"
@@ -47,8 +47,8 @@ struct matrix_storage
 #undef THIS /* Needed for NT */
 #endif
 
-#define THIS ((struct matrix_storage*)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct matrix_storage*)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 static struct pike_string *s_array;
 static struct pike_string *s__clr;
diff --git a/src/modules/Parser/html.c b/src/modules/Parser/html.c
index fe2e1dcc218fb502e97fe28a338feb1ac462176d..c2cf863f33106c917336af8b402976a8f60fec09 100644
--- a/src/modules/Parser/html.c
+++ b/src/modules/Parser/html.c
@@ -267,8 +267,8 @@ typedef enum { STATE_DONE=0, STATE_WAIT, STATE_REREAD, STATE_REPARSE } newstate;
 #undef THIS /* Needed for NT */
 #endif
 
-#define THIS ((struct parser_html_storage*)(fp->current_storage))
-#define THISOBJ (fp->current_object)
+#define THIS ((struct parser_html_storage*)(Pike_fp->current_storage))
+#define THISOBJ (Pike_fp->current_object)
 
 static struct pike_string *empty_string;
 
@@ -835,6 +835,11 @@ static void html_add_container(INT32 args)
    else if (sp[1-args].type == T_INT && sp[1-args].u.integer)
      SIMPLE_BAD_ARG_ERROR("add_tag", 1, "zero, string, array or function");
 
+   if (args > 2) {
+     pop_n_elems(args-2);
+     args = 2;
+   }
+
    if (THIS->mapcont->refs>1)
    {
       push_mapping(THIS->mapcont);
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 1954b3510546e03c17f7e7b40b815faf0628959a..b190dc90dce990b18747b5a601a3596baecd5350 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -19,7 +19,7 @@
 #include "threads.h"
 #include "module_support.h"
 
-RCSID("$Id: glue.c,v 1.16 2000/04/13 18:43:26 grubba Exp $");
+RCSID("$Id: glue.c,v 1.17 2000/07/07 13:58:57 grubba Exp $");
 
 #ifdef USE_SYSTEM_REGEXP
 #include <regexp.h>
@@ -44,7 +44,7 @@ struct regexp_glue
 #undef THIS
 #endif
 
-#define THIS ((struct regexp_glue *)(fp->current_storage))
+#define THIS ((struct regexp_glue *)(Pike_fp->current_storage))
 
 static void do_free(void)
 {
diff --git a/src/modules/_Crypto/cbc.c b/src/modules/_Crypto/cbc.c
index 626807d7dc770d5fd2a479d34d0fd4698f48bf76..48629214aeb10cc40fadc880de300501dddd8daf 100644
--- a/src/modules/_Crypto/cbc.c
+++ b/src/modules/_Crypto/cbc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cbc.c,v 1.14 1999/02/10 21:51:31 hubbe Exp $
+ * $Id: cbc.c,v 1.15 2000/07/07 13:57:15 grubba Exp $
  *
  * CBC (Cipher Block Chaining Mode) crypto module for Pike.
  *
@@ -36,7 +36,7 @@ struct pike_crypto_cbc {
 };
 
 #undef THIS
-#define THIS	((struct pike_crypto_cbc *)(fp->current_storage))
+#define THIS	((struct pike_crypto_cbc *)(Pike_fp->current_storage))
 /*
  * Globals
  */
diff --git a/src/modules/_Crypto/crypto.c b/src/modules/_Crypto/crypto.c
index 8bd07d0bb0a5071eafacffdf1751435073bd2646..c7ed7f420c142aa00c88d3e868cf566f4f76da44 100644
--- a/src/modules/_Crypto/crypto.c
+++ b/src/modules/_Crypto/crypto.c
@@ -1,5 +1,5 @@
 /*
- * $Id: crypto.c,v 1.31 2000/03/28 12:16:39 grubba Exp $
+ * $Id: crypto.c,v 1.32 2000/07/07 13:57:15 grubba Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -58,7 +58,7 @@ static const char *crypto_functions[] = {
 };
 
 #undef THIS
-#define THIS	((struct pike_crypto *)(fp->current_storage))
+#define THIS	((struct pike_crypto *)(Pike_fp->current_storage))
 
 static struct program *pike_crypto_program;
 
diff --git a/src/modules/_Crypto/des.c b/src/modules/_Crypto/des.c
index 1e1c76c98abad854b43a5caa576f9f766d0aa83e..fb865dae7076504083d09d4b36f621e2c0ba52eb 100644
--- a/src/modules/_Crypto/des.c
+++ b/src/modules/_Crypto/des.c
@@ -1,5 +1,5 @@
 /*
- * $Id: des.c,v 1.14 1999/06/19 20:26:01 hubbe Exp $
+ * $Id: des.c,v 1.15 2000/07/07 13:57:15 grubba Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -48,7 +48,7 @@ struct pike_crypto_des {
 };
 
 #undef THIS
-#define THIS ((struct pike_crypto_des *) fp->current_storage)
+#define THIS ((struct pike_crypto_des *) Pike_fp->current_storage)
 
 /*
  * Globals
diff --git a/src/modules/_Crypto/pipe.c b/src/modules/_Crypto/pipe.c
index 55191bf9a1545c266d0da5e9e36f79a648933c4d..70a159cedab2cbfbb6d23fcd81224fdefda22607 100644
--- a/src/modules/_Crypto/pipe.c
+++ b/src/modules/_Crypto/pipe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pipe.c,v 1.15 1999/06/19 20:26:02 hubbe Exp $
+ * $Id: pipe.c,v 1.16 2000/07/07 13:57:15 grubba Exp $
  *
  * PIPE crypto module for Pike.
  *
@@ -36,7 +36,7 @@ struct pike_crypto_pipe {
 };
 
 #undef THIS
-#define THIS	((struct pike_crypto_pipe *)(fp->current_storage))
+#define THIS	((struct pike_crypto_pipe *)(Pike_fp->current_storage))
 /*
  * Globals
  */
diff --git a/src/modules/_Crypto/rsa.c b/src/modules/_Crypto/rsa.c
index 35494357bf9e65b4ad736cda8109a9136a0b7e66..f66bc90ed99f13e9cbbdba3f04eb52dc9b0b1448 100644
--- a/src/modules/_Crypto/rsa.c
+++ b/src/modules/_Crypto/rsa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rsa.c,v 1.20 2000/06/20 15:15:43 grubba Exp $
+ * $Id: rsa.c,v 1.21 2000/07/07 13:57:15 grubba Exp $
  *
  * Glue to RSA BSAFE's RSA implementation.
  *
@@ -31,7 +31,7 @@
 
 #include <bsafe.h>
 
-RCSID("$Id: rsa.c,v 1.20 2000/06/20 15:15:43 grubba Exp $");
+RCSID("$Id: rsa.c,v 1.21 2000/07/07 13:57:15 grubba Exp $");
 
 struct pike_rsa_data
 {
@@ -47,7 +47,7 @@ struct pike_rsa_data
 #define P_RSA_PRIVATE_KEY_NOT_SET	2
 #define P_RSA_KEY_NOT_SET	3
 
-#define THIS ((struct pike_rsa_data *)(fp->current_storage))
+#define THIS ((struct pike_rsa_data *)(Pike_fp->current_storage))
 
 static struct program *pike_rsa_program = NULL;
 
@@ -227,7 +227,7 @@ static void f_set_public_key(INT32 args)
   copy_shared_string(THIS->e, sp[-1].u.string);
 
   pop_n_elems(args + 1);
-  ref_push_object(fp->current_object);
+  ref_push_object(Pike_fp->current_object);
 }
 
 /* object set_private_key(bignum priv, array(bignum)|void extra) */
@@ -281,7 +281,7 @@ static void f_set_private_key(INT32 args)
   /* FIXME: extra is currently ignored */
 
   pop_n_elems(args + 1);
-  ref_push_object(fp->current_object);
+  ref_push_object(Pike_fp->current_object);
 }
 
 /* string cooked_get_n() */
diff --git a/src/modules/_Image_TIFF/image_tiff.c b/src/modules/_Image_TIFF/image_tiff.c
index 64a6e38ed1f6071d870e8405b1f889c561b38623..47c311dce11586c5cedf1de9c9baae07346fb7d1 100644
--- a/src/modules/_Image_TIFF/image_tiff.c
+++ b/src/modules/_Image_TIFF/image_tiff.c
@@ -13,7 +13,7 @@
 
 
 #ifdef HAVE_LIBTIFF
-RCSID("$Id: image_tiff.c,v 1.13 2000/03/27 07:42:57 hubbe Exp $");
+RCSID("$Id: image_tiff.c,v 1.14 2000/07/07 13:57:27 grubba Exp $");
 
 #include "global.h"
 #include "machine.h"
@@ -364,11 +364,13 @@ void low_image_tiff_decode( struct buffer *buf,
     free_object(res->alpha);
     res->alpha = sp[-1].u.object;
     sp--;
+    dmalloc_touch_svalue(sp);
   }
   apply( res->img, "mirrory", 0);
   free_object(res->img);
   res->img = sp[-1].u.object;
   sp--;
+  dmalloc_touch_svalue(sp);
   if(!image_only)
   {
 #ifdef HAVE_TIFFIOP_H
@@ -646,6 +648,7 @@ static void image_tiff__decode( INT32 args )
   {
     struct mapping *tmp = sp[-1].u.mapping;
     sp--;
+    dmalloc_touch_svalue(sp);
     pop_n_elems(args);
     push_mapping( tmp );
   }
diff --git a/src/modules/_Image_TTF/image_ttf.c b/src/modules/_Image_TTF/image_ttf.c
index 4a2a767b9b544401198f53ab516b63bb33ee938b..4da2ab3a8db6d7e73235551392ad78df8a5c76db 100644
--- a/src/modules/_Image_TTF/image_ttf.c
+++ b/src/modules/_Image_TTF/image_ttf.c
@@ -1,12 +1,12 @@
 /*
- * $Id: image_ttf.c,v 1.29 2000/04/05 15:09:16 grubba Exp $
+ * $Id: image_ttf.c,v 1.30 2000/07/07 13:57:44 grubba Exp $
  */
 
 #include "config.h"
 
 
 #include "global.h"
-RCSID("$Id: image_ttf.c,v 1.29 2000/04/05 15:09:16 grubba Exp $");
+RCSID("$Id: image_ttf.c,v 1.30 2000/07/07 13:57:44 grubba Exp $");
 
 #ifdef HAVE_LIBTTF
 #if defined(HAVE_FREETYPE_FREETYPE_H) && defined(HAVE_FREETYPE_FTXKERN_H)
@@ -260,7 +260,7 @@ static void image_ttf_make(INT32 args)
 **!	This represents instances of TTF Faces.
 */
 
-#define THISOBJ (fp->current_object)
+#define THISOBJ (Pike_fp->current_object)
 #define THISf ((struct image_ttf_face_struct*)get_storage(THISOBJ,image_ttf_face_program))
 #define THISi ((struct image_ttf_faceinstance_struct*)get_storage(THISOBJ,image_ttf_faceinstance_program))
 
diff --git a/src/modules/call_out/call_out.c b/src/modules/call_out/call_out.c
index 831a75062b3074e7f96e0f7c93e5c2cc36dc8a78..80dbb3eb8195983d14c6a1295888733b58fd9e34 100644
--- a/src/modules/call_out/call_out.c
+++ b/src/modules/call_out/call_out.c
@@ -6,7 +6,7 @@
 /**/
 #include "global.h"
 #include "config.h"
-RCSID("$Id: call_out.c,v 1.33 2000/04/13 20:15:14 hubbe Exp $");
+RCSID("$Id: call_out.c,v 1.34 2000/07/07 14:01:47 grubba Exp $");
 #include "array.h"
 #include "dynamic_buffer.h"
 #include "object.h"
@@ -374,9 +374,9 @@ static struct array * new_call_out(int num_arg,struct svalue *argp)
 #endif
     my_add_timeval(& new->tv, &current_time);
 
-  if(fp && fp->current_object)
+  if(Pike_fp && Pike_fp->current_object)
   {
-    add_ref(new->caller=fp->current_object);
+    add_ref(new->caller=Pike_fp->current_object);
   }else{
     new->caller=0;
   }