diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index a0335eff31..5ee4660a03 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1109,7 +1109,11 @@ namespace Content.Client.Preferences.UI
                 return;
             }
 
-            var species = _prototypeManager.EnumeratePrototypes<SpeciesPrototype>();
+            if (!_speciesList.Exists(x => x.ID == Profile.Species))
+            {
+                CSpeciesButton.Select(0);
+                return;
+            }
 
             CSpeciesButton.Select(_speciesList.FindIndex(x => x.ID == Profile.Species));
         }
@@ -1321,20 +1325,19 @@ namespace Content.Client.Preferences.UI
         {
             var allowedSpecies = new List<SpeciesPrototype>();
 
-            var rawSpecieList = _prototypeManager.EnumeratePrototypes<SpeciesPrototype>()
-                .Where((specie) =>
+            var rawSpecieList = _prototypeManager.EnumeratePrototypes<SpeciesPrototype>().Where(specie =>
+            {
+                switch (specie.RoundStart)
                 {
-                    if (specie.RoundStart && (specie.SponsorOnly || specie.ForAdmins))
-                    {
+                    case true when specie.SponsorOnly || specie.ForAdmins:
                         return true;
-                    }
-                    else if (specie.RoundStart)
-                    {
+                    case true:
                         allowedSpecies.Add(specie);
                         return false;
-                    }
-                    return false;
-                }).ToList();
+                    default:
+                        return false;
+                }
+            }).ToList();
 
             if (_sponsorsManager.TryGetInfo(out var sponsor))
             {
diff --git a/Content.Shared/Plants/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs
index fd256fd926..cbe052f8d5 100644
--- a/Content.Shared/Plants/PottedPlantHideSystem.cs
+++ b/Content.Shared/Plants/PottedPlantHideSystem.cs
@@ -31,7 +31,7 @@ namespace Content.Shared.Plants
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            Rustle(uid, component, args.User);
             args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
         }
 
@@ -40,24 +40,24 @@ namespace Content.Shared.Plants
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            Rustle(uid, component, args.User);
 
             var gotItem = _stashSystem.TryGetItem(uid, args.User);
             if (!gotItem)
             {
                 var msg = Loc.GetString("potted-plant-hide-component-interact-hand-got-no-item-message");
-                _popupSystem.PopupEntity(msg, uid, args.User);
+                _popupSystem.PopupClient(msg, uid, args.User);
             }
 
             args.Handled = gotItem;
         }
 
-        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null)
+        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null)
         {
             if (!Resolve(uid, ref component))
                 return;
 
-            _audio.PlayPvs(component.RustleSound, uid, AudioParams.Default.WithVariation(0.25f));
+            _audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f));
         }
     }
 }
diff --git a/Resources/Prototypes/_White/Species/felinid.yml b/Resources/Prototypes/_White/Species/felinid.yml
index 027d9b7496..7aab46d81c 100644
--- a/Resources/Prototypes/_White/Species/felinid.yml
+++ b/Resources/Prototypes/_White/Species/felinid.yml
@@ -10,7 +10,7 @@
   bodyTypes:
     - HumanNormal
   sponsorOnly: true
-  forAmins: true
+  forAdmins: true
 
 - type: markingPoints
   id: MobFelinidMarkingLimits