diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c
index b88e6d157cf2042b6510ffb665b6be50447e7c70..d4f7fdde8aaae3af826b69212c65d5cacd9fae98 100644
--- a/src/modules/Image/encodings/xcf.c
+++ b/src/modules/Image/encodings/xcf.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: xcf.c,v 1.23 2000/10/08 22:39:54 per Exp $");
+RCSID("$Id: xcf.c,v 1.24 2000/10/10 20:50:54 grubba Exp $");
 
 #include "image_machine.h"
 
@@ -50,9 +50,8 @@ extern struct program *image_program;
 struct buffer
 {
   struct pike_string *s;
-  int base_offset;
-  int base_len;
-
+  ptrdiff_t base_offset;
+  ptrdiff_t base_len;
   size_t len;
   unsigned char *str;
 };
@@ -179,8 +178,8 @@ static void f_substring_get_short( INT32 args )
 }
 
 static void push_substring( struct pike_string *s, 
-                            int offset,
-                            int len )
+                            ptrdiff_t offset,
+                            ptrdiff_t len )
 {
   struct object *o = clone_object( substring_program, 0 );
   struct substring *ss = SS(o);
@@ -191,7 +190,7 @@ static void push_substring( struct pike_string *s,
   push_object( o );
 }
 
-static void free_substring( )
+static void free_substring(struct object *o)
 {
   if( SS(fp->current_object)->s )
   {
diff --git a/src/modules/_Crypto/rijndael.c b/src/modules/_Crypto/rijndael.c
index 4064b475caddbee238aaddfbc6ba1a82bb7ae569..47aef626d2063e503d6742f1839d0f7948892e79 100644
--- a/src/modules/_Crypto/rijndael.c
+++ b/src/modules/_Crypto/rijndael.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rijndael.c,v 1.2 2000/10/02 20:06:45 grubba Exp $
+ * $Id: rijndael.c,v 1.3 2000/10/10 20:52:56 grubba Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -101,7 +101,7 @@ static void f_set_encrypt_key(INT32 args)
 	  "(must be 16, 24 or 32).\n");
   }
   MEMCPY(k, key->str, key->len);
-  THIS->rounds = 6 + key->len/32;
+  DO_NOT_WARN(THIS->rounds = 6 + key->len/32);
   rijndaelKeySched(k, THIS->keySchedule, THIS->rounds);
   THIS->crypt_fun = rijndaelEncrypt;
 }
@@ -118,7 +118,7 @@ static void f_set_decrypt_key(INT32 args)
 	  "(must be 16, 24 or 32).\n");
   }
   MEMCPY(k, key->str, key->len);
-  THIS->rounds = 6 + key->len/32;
+  DO_NOT_WARN(THIS->rounds = 6 + key->len/32);
   rijndaelKeySched(k, THIS->keySchedule, THIS->rounds);
   rijndaelKeyEncToDec(THIS->keySchedule, THIS->rounds);
   THIS->crypt_fun = rijndaelDecrypt;
diff --git a/src/pike_search.c b/src/pike_search.c
index 5ca583573b4bcccb35bbde5fcbccfa37992ac9b5..5bf909e38690c29bfeea531416699bc631ef574a 100644
--- a/src/pike_search.c
+++ b/src/pike_search.c
@@ -12,6 +12,7 @@
 #include "interpret.h"
 #include "pike_macros.h"
 #include "pike_search.h"
+#include "bignum.h"
 
 ptrdiff_t pike_search_struct_offset;
 #define OB2MSEARCH(O) ((struct pike_mem_searcher *)((O)->storage+pike_search_struct_offset))
@@ -58,7 +59,7 @@ void free_mem_searcher(void *m)
 #define GENERIC_GET4_CHARS(PTR) \
  ( ((PTR)[0] << 24) + ( (PTR)[1] << 16 ) +( (PTR)[2] << 8 ) +  (PTR)[3] )
 
-#define HUBBE_ALIGN0(q) q=(char *)( ((long)q) & -sizeof(INT32))
+#define HUBBE_ALIGN0(q) q=(char *)( ((ptrdiff_t)q) & -sizeof(INT32))
 #define GET_4_ALIGNED_CHARS0(PTR)  (*(INT32 *)(PTR))
 #define GET_4_UNALIGNED_CHARS0(PTR)  EXTRACT_INT(PTR)
 
@@ -205,8 +206,7 @@ static void f_pike_search(INT32 args)
 			     s->len - start);
 
   pop_n_elems(args);
-  push_int( SUBTRACT_PCHARP(in, ret) );
-  
+  push_int64( SUBTRACT_PCHARP(in, ret) );  
 }
 
 /* Compatibility: All functions using these two functions
diff --git a/src/pike_search.h b/src/pike_search.h
index 34af1552c8b68428381f8875e1d4dc1e0a198ac7..4e9e38fe885799c622c0c764360af91481f8bfa4 100644
--- a/src/pike_search.h
+++ b/src/pike_search.h
@@ -11,7 +11,8 @@
 struct hubbe_search_link
 {
   struct hubbe_search_link *next;
-  INT32 key, offset;
+  ptrdiff_t offset;
+  INT32 key;
 };
 
 struct hubbe_searcher
@@ -20,7 +21,7 @@ struct hubbe_searcher
   void *needle;
   ptrdiff_t needlelen;
 
-  unsigned INT32 hsize, max;
+  size_t hsize, max;
   struct hubbe_search_link links[MEMSEARCH_LINKS];
   struct hubbe_search_link *set[MEMSEARCH_LINKS];
 };
diff --git a/src/pike_search_engine.c b/src/pike_search_engine.c
index d82c8e371914cdf7ad9b6ba859cb53ef012bcb92..e2c2d419343380edda067f5317c807694b51b965 100644
--- a/src/pike_search_engine.c
+++ b/src/pike_search_engine.c
@@ -104,7 +104,7 @@ int NameN(init_hubbe_search)(struct hubbe_searcher *s,
   if(max > MEMSEARCH_LINKS) max=MEMSEARCH_LINKS;
   
   /* This assumes 512 buckets - Hubbe */
-  maxlinklength=my_sqrt(max/2)+1;
+  maxlinklength = my_sqrt(DO_NOT_WARN((unsigned int)max/2))+1;
   
   ptr=& s->links[0];
   
@@ -219,7 +219,7 @@ void NameN(init_memsearch)(
       return;
 
     case 1:
-      s->mojt.data=(void *)(long)(needle[0]);
+      s->mojt.data=(void *)(ptrdiff_t)(needle[0]);
       s->mojt.vtab=& PxC3(memchr_search,NSHIFT,_vtable);
       return;
 
@@ -266,7 +266,7 @@ void NameN(init_memsearch)(
 
 
 SearchMojt NameN(compile_memsearcher)(NCHAR *needle,
-				      int len,
+				      ptrdiff_t len,
 				      int max_haystacklen,
 				      struct pike_string *hashkey)
 {