diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 7b85979381..e6f08d58d0 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -1541,9 +1541,10 @@ gimp_layer_mode_get_format (GimpLayerMode           mode,
 
     case GIMP_LAYER_COLOR_SPACE_LAB:
       return babl_format_with_space ("CIE Lab alpha float", preferred_format);
-    }
 
-  g_return_val_if_reached (babl_format_with_space ("RGBA float", preferred_format));
+    default:
+      g_return_val_if_reached (babl_format_with_space ("RGBA float", preferred_format));
+    }
 }
 
 GimpLayerCompositeRegion
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 1100b43ab7..c8fd60fc30 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -1034,13 +1034,10 @@ set_flame_preview (GimpProcedureConfig *proc_config)
     return;
 
   g_object_get (proc_config, "settings-data", &settings_bytes, NULL);
-  if (settings_bytes != NULL)
-    {
-      if (g_bytes_get_size (settings_bytes) == sizeof (FlameSettings))
-        config = *((FlameSettings *) g_bytes_get_data (settings_bytes, NULL));
-
-      g_bytes_unref (settings_bytes);
-    }
+  if (settings_bytes != NULL &&
+      g_bytes_get_size (settings_bytes) == sizeof (FlameSettings))
+    config = *((FlameSettings *) g_bytes_get_data (settings_bytes, NULL));
+  g_bytes_unref (settings_bytes);
 
   g_object_get (proc_config,
                 "x",                     &config.cp.center[0],
diff --git a/plug-ins/selection-to-path/spline.c b/plug-ins/selection-to-path/spline.c
index 1e8c2e7367..92c90fb0f7 100644
--- a/plug-ins/selection-to-path/spline.c
+++ b/plug-ins/selection-to-path/spline.c
@@ -83,6 +83,9 @@ evaluate_spline (spline_type s, real t)
   real one_minus_t = 1.0 - t;
   polynomial_degree degree = SPLINE_DEGREE (s);
 
+  for (i = 0; i < 4; i++)
+    V[i] = new_spline ();
+
   for (i = 0; i <= degree; i++)
     V[0].v[i] = s.v[i];