diff --git a/Penumbra/UI/AdvancedWindow/FileEditor.cs b/Penumbra/UI/AdvancedWindow/FileEditor.cs
index 01bf112b..c95884c6 100644
--- a/Penumbra/UI/AdvancedWindow/FileEditor.cs
+++ b/Penumbra/UI/AdvancedWindow/FileEditor.cs
@@ -204,7 +204,7 @@ public class FileEditor<T>(
 
     private void SaveButton()
     {
-        var canSave = _changed && _currentFile != null && _currentFile.Valid;
+        var canSave = _changed && _currentFile is { Valid: true };
         if (ImGuiUtil.DrawDisabledButton("Save to File", Vector2.Zero,
                 $"Save the selected {fileType} file with all changes applied. This is not revertible.", !canSave))
         {
diff --git a/Penumbra/UI/ModsTab/ImcManipulationDrawer.cs b/Penumbra/UI/ModsTab/ImcManipulationDrawer.cs
index c14652ac..694ae11c 100644
--- a/Penumbra/UI/ModsTab/ImcManipulationDrawer.cs
+++ b/Penumbra/UI/ModsTab/ImcManipulationDrawer.cs
@@ -26,6 +26,7 @@ public static class ImcManipulationDrawer
             };
             identifier = identifier with
             {
+                ObjectType = type,
                 EquipSlot = equipSlot,
                 SecondaryId = identifier.SecondaryId == 0 ? 1 : identifier.SecondaryId,
             };