diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index 1de62cce2..11eab4063 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -15,7 +15,6 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 import evolution from '../renderers/evolution';
-import { StatType } from '../renderers/stats';
 import { AccountInfo } from '../types/accountInfo';
 
 export const evolutionCommand = new Promise<CommandRegistryRaw>(
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index 17297119a..595faeba6 100644
--- a/src/commands/ownedTanks.tsx
+++ b/src/commands/ownedTanks.tsx
@@ -91,17 +91,12 @@ export const ownedTanksCommand: CommandRegistry = {
       <Wrapper>
         <TitleBar
           name={accountInfo[id].nickname}
-          nameDiscriminator={
-            clanData[id]?.clan ? `[${clanData[id]?.clan?.tag}]` : undefined
-          }
           image={
             clanData[id]?.clan
               ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData[id]?.clan?.emblem_set_id}.png`
               : undefined
           }
-          description={`Tier ${
-            TIER_ROMAN_NUMERALS[tier as Tier]
-          } tanks • ${new Date().toDateString()}`}
+          description={`Tier ${TIER_ROMAN_NUMERALS[tier as Tier]} tanks`}
         />
 
         {filteredTanks.length === 0 && <NoData type={NoDataType.TanksFound} />}
diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx
index e6506b3b7..29ec7e91a 100644
--- a/src/commands/ratings.tsx
+++ b/src/commands/ratings.tsx
@@ -513,8 +513,7 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
             <TitleBar
               name={titleName}
               image={titleImage}
-              nameDiscriminator={titleNameDiscriminator}
-              description={`${titleDescription} • ${new Date().toDateString()}`}
+              description={titleDescription}
             />
 
             {items && (
diff --git a/src/components/Breakdown/components/Row.tsx b/src/components/Breakdown/components/Row.tsx
index 9c4a7281f..04328e483 100644
--- a/src/components/Breakdown/components/Row.tsx
+++ b/src/components/Breakdown/components/Row.tsx
@@ -1,5 +1,4 @@
 import { Percentile } from '../../../constants/percentiles';
-import { TankType } from '../../../core/blitz/tankopedia';
 import { theme } from '../../../stitches.config';
 import { TREE_TYPE_ICONS, TreeTypeEnum } from '../../Tanks';
 import { RowStat } from './RowStat';
@@ -17,7 +16,7 @@ interface RowProps {
   title: string;
   minimized?: boolean;
   treeType?: TreeTypeEnum;
-  tankType?: TankType;
+  tankType?: string;
 
   stats: (RowStatItem | undefined)[];
 }
diff --git a/src/core/discord/normalizeInteractionReturnable.ts b/src/core/discord/normalizeInteractionReturnable.ts
index 1e5ef9561..0ee6cd014 100644
--- a/src/core/discord/normalizeInteractionReturnable.ts
+++ b/src/core/discord/normalizeInteractionReturnable.ts
@@ -34,6 +34,8 @@ export default async function normalizeInteractionReturnable(
       } else if (item instanceof AttachmentBuilder) {
         if (!reply.files) reply.files = [];
         reply.files.push(item);
+      } else if (item === null) {
+        return;
       } else {
         const image = await jsxToPng(item);
         if (!reply.files) reply.files = [];
diff --git a/src/renderers/evolution.tsx b/src/renderers/evolution.tsx
index d245afcc2..2b792e388 100644
--- a/src/renderers/evolution.tsx
+++ b/src/renderers/evolution.tsx
@@ -13,11 +13,10 @@ import { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand';
 import { AccountInfo } from '../types/accountInfo';
 import { Histories } from '../types/histories';
 import { PlayerClanInfo } from '../types/playerClanData';
-import { StatType } from './stats';
 
 export default async function evolution<Type extends StatType>(
   type: Type,
-  { start, end, evolutionName }: ResolvedPeriod,
+  { start, end, name }: ResolvedPeriod,
   { region: server, id }: ResolvedPlayer,
   tankId: Type extends 'tank' ? number : null,
 ) {
@@ -84,9 +83,8 @@ export default async function evolution<Type extends StatType>(
     <Wrapper>
       <TitleBar
         name={accountInfo[id].nickname}
-        nameDiscriminator={nameDiscriminator}
         image={image}
-        description={`${evolutionName} • ${new Date().toDateString()}`}
+        description={name}
       />
 
       {/* goofy ahh bug forces me to call them as functions */}
diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx
index 481ce7f10..baf7cfb96 100644
--- a/src/renderers/today.tsx
+++ b/src/renderers/today.tsx
@@ -192,15 +192,12 @@ export default async function today(
     <Wrapper>
       <TitleBar
         name={accountInfo[id].nickname}
-        nameDiscriminator={
-          clanData[id]?.clan ? `[${clanData[id]?.clan?.tag}]` : undefined
-        }
         image={
           clanData[id]?.clan
             ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData[id]?.clan?.emblem_set_id}.png`
             : undefined
         }
-        description={`Today's breakdown • ${new Date().toDateString()}`}
+        description="Today's breakdown"
       />
 
       {rows.length === 0 && <NoData type={NoDataType.BattlesInPeriod} />}