diff --git a/ase/stx/context.c b/ase/stx/context.c
index a894af79..44dbc606 100644
--- a/ase/stx/context.c
+++ b/ase/stx/context.c
@@ -1,5 +1,5 @@
 /*
- * $Id: context.c,v 1.1 2005-05-15 18:37:00 bacon Exp $
+ * $Id: context.c,v 1.2 2005-05-16 14:14:34 bacon Exp $
  */
 
 #include <xp/stx/context.h>
@@ -55,7 +55,7 @@ xp_printf (XP_TEXT("code: %x\n"), byte);
 			operand = __fetch_byte (stx, context);	
 			break;
 		case SEND_UNARY_MESSAGE:
-			operand = _fetch_byte (stx, context);
+			operand = __fetch_byte (stx, context);
 			break;
 		case HALT:
 			goto exit_run_context;		
diff --git a/ase/stx/hash.c b/ase/stx/hash.c
index 138aff29..549b920b 100644
--- a/ase/stx/hash.c
+++ b/ase/stx/hash.c
@@ -1,5 +1,5 @@
 /*
- * $Id: hash.c,v 1.9 2005-05-15 18:37:00 bacon Exp $
+ * $Id: hash.c,v 1.10 2005-05-16 14:14:34 bacon Exp $
  */
 
 #include <xp/stx/hash.h>
@@ -48,7 +48,7 @@ xp_stx_word_t xp_stx_hash_lookup (
 
 xp_stx_word_t xp_stx_hash_lookup_symbol (
 	xp_stx_t* stx, xp_stx_word_t table, 
-	xp_stx_word_t hash, xp_stx_char_t* key_str)
+	xp_stx_word_t hash, const xp_stx_char_t* key_str)
 {
 	xp_stx_word_t link, key;
 
diff --git a/ase/stx/hash.h b/ase/stx/hash.h
index 72b4930b..65715a8c 100644
--- a/ase/stx/hash.h
+++ b/ase/stx/hash.h
@@ -1,5 +1,5 @@
 /*
- * $Id: hash.h,v 1.4 2005-05-15 18:37:00 bacon Exp $
+ * $Id: hash.h,v 1.5 2005-05-16 14:14:34 bacon Exp $
  */
 
 #ifndef _XP_STX_HASH_H_
@@ -19,7 +19,7 @@ xp_stx_word_t xp_stx_hash_lookup (
 	xp_stx_word_t hash, xp_stx_word_t key);
 xp_stx_word_t xp_stx_hash_lookup_symbol (
 	xp_stx_t* stx, xp_stx_word_t table,
-	xp_stx_word_t hash, xp_stx_char_t* key_str);
+	xp_stx_word_t hash, const xp_stx_char_t* key_str);
 void xp_stx_hash_insert (
 	xp_stx_t* stx, xp_stx_word_t table,
 	xp_stx_word_t hash, xp_stx_word_t key, xp_stx_word_t value);
diff --git a/ase/stx/misc.c b/ase/stx/misc.c
index 40c5396d..ee887184 100644
--- a/ase/stx/misc.c
+++ b/ase/stx/misc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: misc.c,v 1.1 2005-05-15 18:37:00 bacon Exp $
+ * $Id: misc.c,v 1.2 2005-05-16 14:14:34 bacon Exp $
  */
 
 #include <xp/stx/misc.h>
@@ -35,7 +35,7 @@ xp_stx_word_t xp_stx_strhash (const xp_stx_char_t* str)
 {
 	xp_stx_word_t h = 0;
 	xp_stx_byte_t* bp, * be;
-	xp_stx_char_t* p = str;
+	const xp_stx_char_t* p = str;
 
 	while (*p != XP_STX_CHAR('\0')) {
 		bp = (xp_stx_byte_t*)p;
@@ -51,7 +51,7 @@ xp_stx_word_t xp_stx_strxhash (const xp_stx_char_t* str, xp_stx_word_t len)
 {
 	xp_stx_word_t h = 0;
 	xp_stx_byte_t* bp, * be;
-	xp_stx_char_t* p = str, * end = str + len;
+	const xp_stx_char_t* p = str, * end = str + len;
 
 	while (p < end) {
 		bp = (xp_stx_byte_t*)p;