diff --git a/FModel/Creator/Bases/FN/BaseJuno.cs b/FModel/Creator/Bases/FN/BaseJuno.cs
index bcabb7bf..9f233bb6 100644
--- a/FModel/Creator/Bases/FN/BaseJuno.cs
+++ b/FModel/Creator/Bases/FN/BaseJuno.cs
@@ -28,7 +28,7 @@ public class BaseJuno : BaseIcon
             {
                 foreach (var data in additionalData)
                 {
-                    if (data.NonConstStruct?.TryGetValue(out FSoftObjectPath largePreview, "LargePreviewImage", "SmallPreviewImage") ?? false)
+                    if (data.NonConstStruct?.TryGetValue(out FSoftObjectPath largePreview, "LargePreviewImage", "SmallPreviewImage") == true)
                     {
                         _character.Preview = Utils.GetBitmap(largePreview);
                         break;
diff --git a/FModel/Creator/CreatorPackage.cs b/FModel/Creator/CreatorPackage.cs
index e93caf19..91804547 100644
--- a/FModel/Creator/CreatorPackage.cs
+++ b/FModel/Creator/CreatorPackage.cs
@@ -33,7 +33,6 @@ public class CreatorPackage : IDisposable
         switch (_object.ExportType)
         {
             // Fortnite
-            case "FortCreativeWeaponMeleeItemDefinition":
             case "AthenaConsumableEmoteItemDefinition":
             case "AthenaSkyDiveContrailItemDefinition":
             case "AthenaLoadingScreenItemDefinition":
@@ -101,7 +100,6 @@ public class CreatorPackage : IDisposable
             case "FortConsumableItemDefinition":
             case "StWFortAccoladeItemDefinition":
             case "FortAccountBuffItemDefinition":
-            case "FortWeaponMeleeItemDefinition":
             case "FortPlayerPerksItemDefinition":
             case "FortPlaysetPropItemDefinition":
             case "FortPrerollDataItemDefinition":
@@ -135,9 +133,7 @@ public class CreatorPackage : IDisposable
             case "FortCampaignHeroLoadoutItemDefinition":
             case "FortConditionalResourceItemDefinition":
             case "FortChallengeBundleScheduleDefinition":
-            case "FortWeaponMeleeDualWieldItemDefinition":
             case "FortDailyRewardScheduleTokenDefinition":
-            case "FortCreativeWeaponRangedItemDefinition":
             case "FortVehicleCosmeticsItemDefinition_Body":
             case "FortVehicleCosmeticsItemDefinition_Skin":
             case "FortVehicleCosmeticsItemDefinition_Wheel":
@@ -164,7 +160,11 @@ public class CreatorPackage : IDisposable
             case "FortSpyTechItemDefinition":
             case "FortAccoladeItemDefinition":
             case "FortContextTrapItemDefinition":
+            case "FortWeaponMeleeItemDefinition":
             case "FortWeaponRangedItemDefinition":
+            case "FortCreativeWeaponMeleeItemDefinition":
+            case "FortWeaponMeleeDualWieldItemDefinition":
+            case "FortCreativeWeaponRangedItemDefinition":
             case "Daybreak_LevelExitVehicle_PartItemDefinition_C":
                 creator = new BaseIconStats(_object, _style);
                 return true;