diff --git a/ChangeLog b/ChangeLog
index 501fc51157..20744081ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jun  7 01:21:43 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* plug-ins/script-fu/script-fu.c: fixed param passing for
+	INT8 and INT16 types. This used to fail on big endian machines
+
+	* plug-ins/maze/maze.c: properly handle INT8 and INT16 types.
+	With these two fixes, circuit.scm will no longer crash on
+	big endian machines
 
 Sun Jun  7 00:19:22 EDT 1998  Adrian Likins <adrian@gimp.org>
 
diff --git a/TODO b/TODO
index 4ad29c8517..889d2e9545 100644
--- a/TODO
+++ b/TODO
@@ -30,4 +30,4 @@ export filters...
 
 previews in file save (for jpeg compression, etc)
 
-
+save/restore state of major dialogs (exported to the PDB too)
diff --git a/plug-ins/maze/maze.c b/plug-ins/maze/maze.c
index edbc2e51f9..e47b05fe7b 100644
--- a/plug-ins/maze/maze.c
+++ b/plug-ins/maze/maze.c
@@ -203,13 +203,13 @@ run    (gchar    *name,
 	}
       if (status == STATUS_SUCCESS)
 	{
-	  mvals.width = (gint16)    param[3].data.d_int32;
-	  mvals.height = (gint16)   param[4].data.d_int32;
-	  mvals.tile = (gint8)      param[5].data.d_int32;
-          mvals.algorithm = (gint8) param[6].data.d_int32;
+	  mvals.width = (gint16)    param[3].data.d_int16;
+	  mvals.height = (gint16)   param[4].data.d_int16;
+	  mvals.tile = (gint8)      param[5].data.d_int8;
+          mvals.algorithm = (gint8) param[6].data.d_int8;
 	  mvals.seed = (gint32)     param[7].data.d_int32;
-	  mvals.multiple = (gint16) param[8].data.d_int32;
-	  mvals.offset = (gint16)   param[9].data.d_int32;
+	  mvals.multiple = (gint16) param[8].data.d_int16;
+	  mvals.offset = (gint16)   param[9].data.d_int16;
 	}
       break;
     case RUN_WITH_LAST_VALS:
diff --git a/plug-ins/script-fu/script-fu.c b/plug-ins/script-fu/script-fu.c
index f28e4587d6..a327354e65 100644
--- a/plug-ins/script-fu/script-fu.c
+++ b/plug-ins/script-fu/script-fu.c
@@ -560,7 +560,7 @@ marshall_proc_db_call (LISP a)
 	  if (success)
 	    {
 	      args[i].type = PARAM_INT16;
-	      args[i].data.d_int32 = get_c_long (car (a));
+	      args[i].data.d_int16 = (gint16) get_c_long (car (a));
 	    }
 	  break;
 	case PARAM_INT8:
@@ -569,7 +569,7 @@ marshall_proc_db_call (LISP a)
 	  if (success)
 	    {
 	      args[i].type = PARAM_INT8;
-	      args[i].data.d_int32 = get_c_long (car (a));
+	      args[i].data.d_int8 = (gint8) get_c_long (car (a));
 	    }
 	  break;
 	case PARAM_FLOAT:
@@ -605,7 +605,7 @@ marshall_proc_db_call (LISP a)
 	  if (success)
 	    {
 	      args[i].type = PARAM_INT16ARRAY;
-	      args[i].data.d_int16array = (short *) (car (a))->storage_as.long_array.data;
+	      args[i].data.d_int16array = (gint16*) (car (a))->storage_as.long_array.data;
 	    }
 	  break;
 	case PARAM_INT8ARRAY:
@@ -614,7 +614,7 @@ marshall_proc_db_call (LISP a)
 	  if (success)
 	    {
 	      args[i].type = PARAM_INT8ARRAY;
-	      args[i].data.d_int8array = (gint8 *) (car (a))->storage_as.string.data;
+	      args[i].data.d_int8array = (gint8*) (car (a))->storage_as.string.data;
 	    }
 	  break;
 	case PARAM_FLOATARRAY: