diff --git a/ChangeLog b/ChangeLog
index cb01150016..e0f71d0a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-06  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/tiff.c (run): corrected check for number of PDB
+	parameters. Fxes bug #136403.
+
+	* app/widgets/gimpfontview.c: removed unused variables.
+
 2004-03-06  Sven Neumann  <sven@gimp.org>
 
 	* libgimpwidgets/gimpquerybox.c (query_box_disconnect): disconnect
diff --git a/app/widgets/gimpfontview.c b/app/widgets/gimpfontview.c
index 290dc1c3ba..ba507e6924 100644
--- a/app/widgets/gimpfontview.c
+++ b/app/widgets/gimpfontview.c
@@ -157,8 +157,6 @@ static void
 gimp_font_view_select_item (GimpContainerEditor *editor,
                             GimpViewable        *viewable)
 {
-  GimpFontView *view = GIMP_FONT_VIEW (editor);
-
   if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item)
     GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item (editor, viewable);
 }
@@ -167,8 +165,6 @@ static void
 gimp_font_view_activate_item (GimpContainerEditor *editor,
 				GimpViewable        *viewable)
 {
-  GimpFontView *view = GIMP_FONT_VIEW (editor);
-
   if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
     GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
 }
diff --git a/plug-ins/common/tiff.c b/plug-ins/common/tiff.c
index afe88565b5..2cc1ff8657 100644
--- a/plug-ins/common/tiff.c
+++ b/plug-ins/common/tiff.c
@@ -294,8 +294,8 @@ run (const gchar      *name,
           status = GIMP_PDB_EXECUTION_ERROR;
         }
     }
-  else if (strcmp (name, "file_tiff_save") == 0
-           || strcmp (name, "file_tiff_save2") == 0 )
+  else if (strcmp (name, "file_tiff_save") == 0 ||
+           strcmp (name, "file_tiff_save2") == 0)
     {
       /* Plug-in is either file_tiff_save or file_tiff_save2 */
       image = orig_image = param[1].data.d_int32;
@@ -353,11 +353,7 @@ run (const gchar      *name,
 
         case GIMP_RUN_NONINTERACTIVE:
           /*  Make sure all the arguments are there!  */
-          if (nparams != 6 || nparams != 7)
-            {
-              status = GIMP_PDB_CALLING_ERROR;
-            }
-          else
+          if (nparams == 6 || nparams == 7)
             {
               switch (param[5].data.d_int32)
                 {
@@ -374,6 +370,10 @@ run (const gchar      *name,
               else
                 tsvals.save_transp_pixels = TRUE;
             }
+          else
+            {
+              status = GIMP_PDB_CALLING_ERROR;
+            }
           break;
 
         case GIMP_RUN_WITH_LAST_VALS: