diff --git a/app/components/avo/profile_item_component.rb b/app/components/avo/profile_item_component.rb
index b585f9733c..458fb2377b 100644
--- a/app/components/avo/profile_item_component.rb
+++ b/app/components/avo/profile_item_component.rb
@@ -12,7 +12,7 @@ class Avo::ProfileItemComponent < Avo::BaseComponent
   end
   prop :title, _Nilable(String), reader: :public
   prop :method, _Nilable(String), reader: :public
-  prop :params, Hash, default: {}.freeze, reader: :public
+  prop :params, _Nilable(Hash), default: {}.freeze, reader: :public
   prop :classes, String, default: "", reader: :public
 
   def title
diff --git a/app/components/avo/sidebar/base_item_component.rb b/app/components/avo/sidebar/base_item_component.rb
index 43d887b2be..84a8212697 100644
--- a/app/components/avo/sidebar/base_item_component.rb
+++ b/app/components/avo/sidebar/base_item_component.rb
@@ -3,7 +3,8 @@
 class Avo::Sidebar::BaseItemComponent < Avo::BaseComponent
   delegate :collapsable, :collapsed, to: :@item
 
-  prop :item, _Nilable(ViewComponent::Base)
+  # Object = Avo::Menu::BaseItem || ViewComponent::Base
+  prop :item, _Nilable(Object), reader: :public
 
   def after_initialize
     @items = @item.items.select(&:visible?)
diff --git a/app/components/avo/sidebar/group_component.html.erb b/app/components/avo/sidebar/group_component.html.erb
index 9fc6a01c4c..fa1879f231 100644
--- a/app/components/avo/sidebar/group_component.html.erb
+++ b/app/components/avo/sidebar/group_component.html.erb
@@ -36,7 +36,7 @@
       menu_target: :items,
       **section_collapse_data_animation
     } do %>
-    <% items.each do |item| %>
+    <% @items.each do |item| %>
       <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
     <% end %>
   <% end %>
diff --git a/app/components/avo/sidebar/heading_component.rb b/app/components/avo/sidebar/heading_component.rb
index c7a4a1c593..d6488db7fa 100644
--- a/app/components/avo/sidebar/heading_component.rb
+++ b/app/components/avo/sidebar/heading_component.rb
@@ -5,5 +5,5 @@ class Avo::Sidebar::HeadingComponent < Avo::BaseComponent
   prop :icon, _Nilable(String)
   prop :collapsable, _Boolean, default: false
   prop :collapsed, _Boolean, default: false
-  prop :key, _Nilable(_Boolean), default: false
+  prop :key, _Nilable(String)
 end
diff --git a/app/components/avo/sidebar/section_component.html.erb b/app/components/avo/sidebar/section_component.html.erb
index f436b2af49..b5ea2c404d 100644
--- a/app/components/avo/sidebar/section_component.html.erb
+++ b/app/components/avo/sidebar/section_component.html.erb
@@ -12,7 +12,7 @@
       menu_target: :items,
       **section_collapse_data_animation
     } do %>
-    <% items.each do |item| %>
+    <% @items.each do |item| %>
       <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
     <% end %>
   <% end %>