diff --git a/menus/scenes/components/SelectedAbility.cs b/menus/scenes/components/SelectedAbility.cs
index ededa950..7ef513af 100644
--- a/menus/scenes/components/SelectedAbility.cs
+++ b/menus/scenes/components/SelectedAbility.cs
@@ -41,8 +41,8 @@ public partial class SelectedAbility : Control
 
     public void AbilityUpdated()
     {
-        var icon = _icon ?? GetNode<TextureRect>("HBoxContainer/Icon");
-        var title = _title ?? GetNode<Label>("HBoxContainer/Title");
+        var icon = _icon ?? GetNode<TextureRect>("%Icon");
+        var title = _title ?? GetNode<Label>("%Title");
         if (icon == null || title == null) return;
         if (_ability == null)
         {
diff --git a/scenes/player_controller/scripts/PlayerController.cs b/scenes/player_controller/scripts/PlayerController.cs
index e25655e3..23255736 100644
--- a/scenes/player_controller/scripts/PlayerController.cs
+++ b/scenes/player_controller/scripts/PlayerController.cs
@@ -24,11 +24,14 @@ using GodotStateCharts;
 
 using Movementtests.addons.godot_state_charts.csharp;
 using Movementtests.forge.abilities;
+using Movementtests.forge.attribute_sets;
 using Movementtests.interfaces;
 using Movementtests.systems;
 using Movementtests.player_controller.Scripts;
 using Movementtests.managers;
 using Movementtests.scenes.components.knockback;
+using Movementtests.scenes.enemies;
+using Movementtests.scenes.player_controller.scripts;
 using Movementtests.tools;
 using Movementtests.tools.calculators;
 using RustyOptions;
@@ -476,7 +479,8 @@ public partial class PlayerController : CharacterBody3D, IForgeEntity, ICueHandl
 		LoadSettings();
 		
 		// General use stuff
-		Attributes = new EntityAttributes([.. ForgeUtils.CollectAttributeList(this)]);
+		// Attributes = new EntityAttributes([.. ForgeUtils.CollectAttributeList(this)]);
+		Attributes = new EntityAttributes([new CharacterAttributeSet(), new PlayerAttributeSet(), new MetaAttributeSet()]);
 		HealthAttribute = Attributes["CharacterAttributeSet.Health"];
 		ManaAttribute = Attributes["PlayerAttributeSet.Mana"];