diff --git a/app/core/gimpitem-preview.c b/app/core/gimpitem-preview.c
index cc2b48e7a9..ced3b74b53 100644
--- a/app/core/gimpitem-preview.c
+++ b/app/core/gimpitem-preview.c
@@ -122,8 +122,8 @@ gimp_item_get_popup_size (GimpViewable *viewable,
 
       if (scaling_up)
         {
-          *popup_width = gimp_item_get_width  (item);
-          *popup_width = gimp_item_get_height (item);
+          *popup_width  = gimp_item_get_width  (item);
+          *popup_height = gimp_item_get_height (item);
         }
 
       return TRUE;
diff --git a/app/text/gimptext.c b/app/text/gimptext.c
index 6649172a64..019799e1d1 100644
--- a/app/text/gimptext.c
+++ b/app/text/gimptext.c
@@ -566,5 +566,5 @@ gimp_text_get_transformation (GimpText    *text,
 
   matrix->coeff[2][0] = 0.0;
   matrix->coeff[2][1] = 0.0;
-  matrix->coeff[2][1] = 1.0;
+  matrix->coeff[2][2] = 1.0;
 }
diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c
index 3d94495812..c1b6bab75d 100644
--- a/app/tools/gimpdrawtool.c
+++ b/app/tools/gimpdrawtool.c
@@ -1210,7 +1210,7 @@ gimp_draw_tool_on_vectors_curve (GimpDrawTool      *draw_tool,
   if (ret_coords)        *ret_coords        = *coord;
   if (ret_pos)           *ret_pos           = -1.0;
   if (ret_segment_start) *ret_segment_start = NULL;
-  if (ret_segment_start) *ret_segment_end   = NULL;
+  if (ret_segment_end)   *ret_segment_end   = NULL;
   if (ret_stroke)        *ret_stroke        = NULL;
 
   min_dist = -1.0;