diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c
index 7fa4039bed..343dc88938 100644
--- a/app/widgets/gimpspinscale.c
+++ b/app/widgets/gimpspinscale.c
@@ -382,7 +382,7 @@ pattern_to_attrs (const gchar *text,
 
   while (TRUE)
     {
-      while (*p && *q && *q != '_')
+      while (*p && q && *q != '_')
         {
           p = g_utf8_next_char (p);
           q++;
diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
index d5400cfdd1..c2e28e4fc4 100644
--- a/plug-ins/file-fli/fli.c
+++ b/plug-ins/file-fli/fli.c
@@ -884,8 +884,8 @@ fli_write_lc (FILE          *f,
       while (xc < fli_header->width)
         {
           sc = 0;
-          while ((linebuf[xc] == old_linebuf[xc]) &&
-                 (xc < fli_header->width)         &&
+          while ((xc < fli_header->width)         &&
+                 (linebuf[xc] == old_linebuf[xc]) &&
                  (sc < 255))
             {
               xc++;
diff --git a/plug-ins/gfig/gfig-circle.c b/plug-ins/gfig/gfig-circle.c
index e3b779597b..0839abfc8e 100644
--- a/plug-ins/gfig/gfig-circle.c
+++ b/plug-ins/gfig/gfig-circle.c
@@ -147,7 +147,7 @@ d_paint_circle (GfigObject *obj)
       gdouble       angle = 0;
       gint          i = 0;
 
-      while (i < 362)
+      while (i < 361)
         {
           static const gdouble step = 2 * G_PI / 180;