diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index fb144ddb7..593133cf6 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,17 @@
+1998-04-13  Mikael Djurfeldt  <mdj@kenneth>
+
+	* ports.c (scm_port_line, scm_set_port_line_x, scm_port_column,
+	scm_set_port_column_x, scm_port_filename,
+	scm_set_port_filename_x): Removed optional arguments.  Added
+	proper argument checking.
+
+	* eval.c, eval.h, coop.c (scm_eval_stack, SCM_EVAL_STACK): Measure
+	stack size in machine words.
+
+	* unif.c (scm_uniform_vector_ref, scm_cvref, scm_array_set_x,
+	rapr1): Use SCM_UCHARS instead of SCM_CHARS for strings.  (Thanks
+	to Ole Myren Röhne.)
+
 1998-04-12  Mikael Djurfeldt  <mdj@kenneth>
 
 	* socket.c: Check for HAVE_UNIX_DOMAIN_SOCKETS instead of
diff --git a/libguile/unif.c b/libguile/unif.c
index 6e53451fb..fb83cee72 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -1113,7 +1113,7 @@ scm_uniform_vector_ref (v, args)
       else
 	return SCM_BOOL_F;
     case scm_tc7_string:
-      return SCM_MAKICHR (SCM_CHARS (v)[pos]);
+      return SCM_MAKICHR (SCM_UCHARS (v)[pos]);
     case scm_tc7_byvect:
       return SCM_MAKINUM (((char *)SCM_CHARS (v))[pos]);
 # ifdef SCM_INUMS_ONLY
@@ -1171,7 +1171,7 @@ scm_cvref (v, pos, last)
       else
 	return SCM_BOOL_F;
     case scm_tc7_string:
-      return SCM_MAKICHR (SCM_CHARS (v)[pos]);
+      return SCM_MAKICHR (SCM_UCHARS (v)[pos]);
     case scm_tc7_byvect:
       return SCM_MAKINUM (((char *)SCM_CHARS (v))[pos]);
 # ifdef SCM_INUMS_ONLY
@@ -1294,7 +1294,7 @@ scm_array_set_x (v, obj, args)
       break;
     case scm_tc7_string:
       SCM_ASRTGO (SCM_ICHRP (obj), badobj);
-      SCM_CHARS (v)[pos] = SCM_ICHR (obj);
+      SCM_UCHARS (v)[pos] = SCM_ICHR (obj);
       break;
     case scm_tc7_byvect:
       if (SCM_ICHRP (obj))
@@ -2277,12 +2277,12 @@ tail:
       break;
     case scm_tc7_string:
       if (n-- > 0)
-	scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, pstate);
+	scm_iprin1 (SCM_MAKICHR (SCM_UCHARS (ra)[j]), port, pstate);
       if (SCM_WRITINGP (pstate))
 	for (j += inc; n-- > 0; j += inc)
 	  {
 	    scm_putc (' ', port);
-	    scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, pstate);
+	    scm_iprin1 (SCM_MAKICHR (SCM_UCHARS (ra)[j]), port, pstate);
 	  }
       else
 	for (j += inc; n-- > 0; j += inc)