diff --git a/scripts/startup/bl_ui/node_add_menu.py b/scripts/startup/bl_ui/node_add_menu.py
index 7789bd50101..4e18e278898 100644
--- a/scripts/startup/bl_ui/node_add_menu.py
+++ b/scripts/startup/bl_ui/node_add_menu.py
@@ -29,6 +29,8 @@ def add_node_type(layout, node_type, *, label=None, poll=None, search_weight=0.0
         props.use_transform = True
         return props
 
+    return None
+
 
 def add_node_type_with_outputs(context, layout, node_type, subnames, *, label=None, search_weight=0.0):
     bl_rna = bpy.types.Node.bl_rna_get_subclass(node_type)
diff --git a/scripts/startup/bl_ui/space_view3d_toolbar.py b/scripts/startup/bl_ui/space_view3d_toolbar.py
index fb88f265192..19b50872a5a 100644
--- a/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -94,7 +94,7 @@ class View3DPanel:
 # **************** standard tool clusters ******************
 
 # Used by vertex & weight paint
-def draw_vpaint_symmetry(layout, vpaint, obj):
+def draw_vpaint_symmetry(layout, obj):
     mesh = obj.data
 
     col = layout.column()
@@ -104,7 +104,7 @@ def draw_vpaint_symmetry(layout, vpaint, obj):
     row.prop(obj, "use_mesh_mirror_z", text="Z", toggle=True)
 
     col = layout.column()
-    col.active = not obj.data.use_mirror_vertex_groups
+    col.active = not mesh.use_mirror_vertex_groups
     col.prop(mesh, "radial_symmetry", text="Radial")
 
 
@@ -1220,15 +1220,12 @@ class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel):
         layout.use_property_split = True
         layout.use_property_decorate = False
 
-        tool_settings = context.tool_settings
-        wpaint = tool_settings.weight_paint
-
         ob = context.object
         mesh = ob.data
 
         layout.prop(mesh, "use_mirror_vertex_groups")
 
-        draw_vpaint_symmetry(layout, wpaint, ob)
+        draw_vpaint_symmetry(layout, ob)
 
         row = layout.row()
         row.active = mesh.use_mirror_vertex_groups
@@ -1303,12 +1300,9 @@ class VIEW3D_PT_tools_vertexpaint_symmetry(Panel, View3DPaintPanel):
         layout.use_property_split = True
         layout.use_property_decorate = False
 
-        tool_settings = context.tool_settings
-        vpaint = tool_settings.vertex_paint
-
         ob = context.object
 
-        draw_vpaint_symmetry(layout, vpaint, ob)
+        draw_vpaint_symmetry(layout, ob)
 
 
 class VIEW3D_PT_tools_vertexpaint_symmetry_for_topbar(Panel):