diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc
index 5ed466125fc..01624c22a16 100644
--- a/source/blender/editors/animation/anim_channels_edit.cc
+++ b/source/blender/editors/animation/anim_channels_edit.cc
@@ -2097,6 +2097,8 @@ static void rearrange_grease_pencil_channels(bAnimContext *ac, eRearrangeAnimCha
           }
           break;
         }
+        default:
+          break;
       }
     }
   }
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
index 3b0a3f3b713..4e4734fe2b7 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
@@ -43,7 +43,7 @@ bool grease_pencil_layer_parent_set(bke::greasepencil::Layer &layer,
   }
 
   layer.parent = parent;
-  BLI_strncpy(layer.parsubstr, bone.c_str(), sizeof(layer.parsubstr));
+  layer.parsubstr = BLI_strdup_null(bone.c_str());
   /* Calculate inverse parent matrix. */
   if (parent) {
     copy_m4_m4(layer.parentinv, parent->world_to_object().ptr());
@@ -65,7 +65,7 @@ void grease_pencil_layer_parent_clear(bke::greasepencil::Layer &layer, const boo
   }
 
   layer.parent = nullptr;
-  layer.parsubstr[0] = 0;
+  MEM_SAFE_FREE(layer.parsubstr);
 
   copy_m4_m4(layer.parentinv, float4x4::identity().ptr());
 }
diff --git a/source/blender/makesrna/intern/rna_grease_pencil.cc b/source/blender/makesrna/intern/rna_grease_pencil.cc
index 5186a1b7759..5683f250066 100644
--- a/source/blender/makesrna/intern/rna_grease_pencil.cc
+++ b/source/blender/makesrna/intern/rna_grease_pencil.cc
@@ -367,7 +367,7 @@ static void rna_GreasePencilLayer_parent_set(PointerRNA *ptr,
   bke::greasepencil::Layer &layer = static_cast<GreasePencilLayer *>(ptr->data)->wrap();
   Object *parent = static_cast<Object *>(value.data);
 
-  ed::greasepencil::grease_pencil_layer_parent_set(layer, parent, layer.parsubstr, false);
+  ed::greasepencil::grease_pencil_layer_parent_set(layer, parent, layer.parent_bone_name(), false);
 }
 
 static void rna_GreasePencilLayer_bone_set(PointerRNA *ptr, const char *value)