diff --git a/src/components/guide-tool/views/GuideToolOngoingView.tsx b/src/components/guide-tool/views/GuideToolOngoingView.tsx
index 3c34631..5c987f4 100644
--- a/src/components/guide-tool/views/GuideToolOngoingView.tsx
+++ b/src/components/guide-tool/views/GuideToolOngoingView.tsx
@@ -101,7 +101,7 @@ export const GuideToolOngoingView: FC<GuideToolOngoingViewProps> = props =>
                                         { (isOwnChat(group.userId)) && GetSessionDataManager().userName }
                                         { (!isOwnChat(group.userId)) && userName }
                                     </Text>
-                                    { group.messages.map((chat, index) => <div key={ index } className={ classNames(chat.roomId ? 'text-break text-underline' : 'text-break', 'chat.roomId' && 'cursor-pointer') } onClick={ () => chat.roomId ? TryVisitRoom(chat.roomId) : null }>{ chat.message }</div>) }
+                                    { group.messages.map((chat, index) => <div key={ index } className={ classNames(chat.roomId ? 'text-break text-underline' : 'text-break', chat.roomId && 'cursor-pointer') } onClick={ () => chat.roomId ? TryVisitRoom(chat.roomId) : null }>{ chat.message }</div>) }
                                 </div>
                                 { (isOwnChat(group.userId)) &&
                                     <div className="shrink-0 message-avatar">
diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx
index 100ecad..4ce43fb 100644
--- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx
+++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx
@@ -58,7 +58,7 @@ export const NavigatorRoomSettingsModTabView: FC<NavigatorRoomSettingsTabViewPro
                         {
                             return (
                                 <Flex key={ index } shrink alignItems="center" gap={ 1 } overflow="hidden">
-                                    <UserProfileIconView userName={ user.userId } />
+                                    <UserProfileIconView userId={ user.userId } />
                                     <Text pointer grow onClick={ event => setSelectedUserId(user.userId) }> { user.userName }</Text>
                                 </Flex>
                             );
diff --git a/src/components/wired/views/extras/WiredExtraVariableEchoView.tsx b/src/components/wired/views/extras/WiredExtraVariableEchoView.tsx
index c41fa3f..43beec4 100644
--- a/src/components/wired/views/extras/WiredExtraVariableEchoView.tsx
+++ b/src/components/wired/views/extras/WiredExtraVariableEchoView.tsx
@@ -129,7 +129,7 @@ export const WiredExtraVariableEchoView: FC<{}> = () =>
         if(fallbackEntry) return [ fallbackEntry, ...variableEntries ];
         if(!fallbackSourceName) return variableEntries;
 
-        return [ {
+        const namedFallback: IWiredVariablePickerEntry = {
             id: sourceVariableToken,
             token: sourceVariableToken,
             label: fallbackSourceName,
@@ -139,7 +139,9 @@ export const WiredExtraVariableEchoView: FC<{}> = () =>
             hasValue: true,
             kind: 'custom',
             target: sourceTargetType
-        }, ...variableEntries ];
+        };
+
+        return [ namedFallback, ...variableEntries ];
     }, [ fallbackSourceName, sourceTargetType, sourceVariableToken, variableEntries ]);
 
     const selectedEntry = useMemo(() => flattenWiredVariablePickerEntries(resolvedVariableEntries).find(entry => (entry.token === sourceVariableToken)) ?? null, [ resolvedVariableEntries, sourceVariableToken ]);