diff --git a/src/Game/Systems/BoostIconsHUDSystem.cpp b/src/Game/Systems/BoostIconsHUDSystem.cpp
index f83278ff..d151a044 100644
--- a/src/Game/Systems/BoostIconsHUDSystem.cpp
+++ b/src/Game/Systems/BoostIconsHUDSystem.cpp
@@ -5,11 +5,13 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
     EntityWrapper assaultEntity = entity.FirstChildByName("Assault");
     EntityWrapper defenderEntity = entity.FirstChildByName("Defender");
     EntityWrapper sniperEntity = entity.FirstChildByName("Sniper");
+    EntityWrapper player = entity.FirstParentWithComponent("Player");
+
 
     if(assaultEntity.Valid()) {
         if (assaultEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = assaultEntity.FirstParentWithComponent("BoostAssault");
-            if (parentWithAssaultBoost.Valid()) {
+            EntityWrapper assaultBoost = player.FirstChildByName("BoostAssault");
+            if (assaultBoost.Valid()) {
                 (double&)assaultEntity["Fill"]["Percentage"] = 1.0;
             } else {
                 (double&)assaultEntity["Fill"]["Percentage"] = 0.0;
@@ -19,8 +21,8 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
 
     if (defenderEntity.Valid()) {
         if (defenderEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = defenderEntity.FirstParentWithComponent("BoostDefender");
-            if (parentWithAssaultBoost.Valid()) {
+            EntityWrapper defenderBoost = player.FirstChildByName("BoostDefender");
+            if (defenderBoost.Valid()) {
                 (double&)defenderEntity["Fill"]["Percentage"] = 1.0;
             } else {
                 (double&)defenderEntity["Fill"]["Percentage"] = 0.0;
@@ -30,8 +32,8 @@ void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrappe
 
     if (sniperEntity.Valid()) {
         if (sniperEntity.HasComponent("Fill")) {
-            EntityWrapper parentWithAssaultBoost = sniperEntity.FirstParentWithComponent("BoostSniper");
-            if (parentWithAssaultBoost.Valid()) {
+            EntityWrapper sniperBoost = player.FirstChildByName("BoostSniper");
+            if (sniperBoost.Valid()) {
                 (double&)sniperEntity["Fill"]["Percentage"] = 1.0;
             } else {
                 (double&)sniperEntity["Fill"]["Percentage"] = 0.0;
diff --git a/src/Game/Systems/EndScreenSystem.cpp b/src/Game/Systems/EndScreenSystem.cpp
index 6a7ee90e..f16adf83 100644
--- a/src/Game/Systems/EndScreenSystem.cpp
+++ b/src/Game/Systems/EndScreenSystem.cpp
@@ -44,7 +44,7 @@ bool EndScreenSystem::OnWin(const Events::Win& e)
             if (blueText.HasComponent("Text"))
                 (bool&)blueText["Text"]["Visible"] = false;
 
-        }else if (e.TeamThatWon == 1) {
+        }else if (e.TeamThatWon == 3) {
             //Blue team won
             if (redSprite.HasComponent("Sprite"))
                 (bool&)redSprite["Sprite"]["Visible"] = false;