diff --git a/Content.Client/ClientPreferencesManager.cs b/Content.Client/ClientPreferencesManager.cs
index 298ba8e80d..5b0296dcde 100644
--- a/Content.Client/ClientPreferencesManager.cs
+++ b/Content.Client/ClientPreferencesManager.cs
@@ -27,6 +27,7 @@ namespace Content.Client
             _netManager.RegisterNetMessage<MsgPreferencesAndSettings>(nameof(MsgPreferencesAndSettings),
                 HandlePreferencesAndSettings);
             _netManager.RegisterNetMessage<MsgUpdateCharacter>(nameof(MsgUpdateCharacter));
+            _netManager.RegisterNetMessage<MsgSelectCharacter>(nameof(MsgSelectCharacter));
         }
 
         public void SelectCharacter(ICharacterProfile profile)
diff --git a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
index d6fcca29fd..8a6e1667e2 100644
--- a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
@@ -72,7 +72,7 @@ namespace Content.Client.GameObjects.Components
     {
         public override void Populate()
         {
-            var humanFacialHairRSIPath = SharedSpriteComponent.TextureRoot / "Mob/human_facial_hair.rsi";
+            var humanFacialHairRSIPath = SharedSpriteComponent.TextureRoot / "Mobs/Customization/human_facial_hair.rsi";
             var humanFacialHairRSI = ResC.GetResource<RSIResource>(humanFacialHairRSIPath).RSI;
 
             var styles = HairStyles.FacialHairStylesMap.ToList();
@@ -160,7 +160,7 @@ namespace Content.Client.GameObjects.Components
 
         public virtual void Populate()
         {
-            var humanHairRSIPath = SharedSpriteComponent.TextureRoot / "Mob/human_hair.rsi";
+            var humanHairRSIPath = SharedSpriteComponent.TextureRoot / "Mobs/Customization/human_hair.rsi";
             var humanHairRSI = ResC.GetResource<RSIResource>(humanHairRSIPath).RSI;
 
             var styles = HairStyles.HairStylesMap.ToList();
diff --git a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
index e1a1cb8b38..580a3de334 100644
--- a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
@@ -7,6 +7,7 @@ using Content.Shared.Interfaces;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Interfaces.Graphics.Overlays;
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Reflection;
@@ -40,6 +41,7 @@ namespace Content.Client.GameObjects.Components.Mobs
         // Required dependencies
         [Dependency] private readonly IOverlayManager _overlayManager;
         [Dependency] private readonly IReflectionManager _reflectionManager;
+        [Dependency] private readonly IPlayerManager _playerManager;
 #pragma warning restore 649
 
         public override void HandleMessage(ComponentMessage message, IComponent component)
@@ -58,6 +60,10 @@ namespace Content.Client.GameObjects.Components.Mobs
         public override void HandleComponentState(ComponentState curState, ComponentState nextState)
         {
             base.HandleComponentState(curState, nextState);
+
+            if(_playerManager?.LocalPlayer != null && _playerManager.LocalPlayer.ControlledEntity != Owner)
+                return;
+
             if (!(curState is OverlayEffectComponentState state) || ActiveOverlays.Equals(state.Overlays))
             {
                 return;
@@ -68,7 +74,7 @@ namespace Content.Client.GameObjects.Components.Mobs
 
         private void SetEffects(List<OverlayContainer> newOverlays)
         {
-            foreach (var container in ActiveOverlays.ShallowClone())
+            foreach (var container in ActiveOverlays.ToArray())
             {
                 if (!newOverlays.Contains(container))
                 {