diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index eae21cd73af8049adc68a1ab40b29b0a7b5c4b69..8f020bf12fe1bb3640703c3724d240e260550fdf 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.166 1999/04/12 02:24:12 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.167 1999/04/17 13:45:52 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -114,7 +114,7 @@ void f_hash(INT32 args)
       break;
 
     default:
-      fatal("Foo!\n");
+      fatal("hash(): Bad string shift:%d\n", sp[-args].u.string->size_shift);
   }
   
   if(args > 1)
diff --git a/src/hashtable.c b/src/hashtable.c
index 237b3d537f499aeab0942b639534783f3c73bd72..6b6341eaadbfe1c7a088a3a1c6adf72e6eb35da9 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -9,7 +9,7 @@
 #include "stuff.h"
 #include "error.h"
 
-RCSID("$Id: hashtable.c,v 1.5 1998/11/22 11:02:51 hubbe Exp $");
+RCSID("$Id: hashtable.c,v 1.6 1999/04/17 13:48:01 grubba Exp $");
 
 static unsigned INT32 gobble(struct pike_string *s)
 {
@@ -84,7 +84,7 @@ struct hash_table *hash_rehash(struct hash_table *h,int size)
 
 #ifdef PIKE_DEBUG
   if( 1 << my_log2(size) != size)
-    fatal("Size is not a exponent of two!\n");
+    fatal("Size is not a power of two!\n");
 #endif
 
   new=(struct hash_table *)calloc(1,sizeof(struct hash_table)+