diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index f92a039a6..4f529209a 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -197,6 +197,11 @@
     min-height: $composition-container-height;
     padding: $session-margin-md 0;
 
+    ul {
+      max-height: 70vh;
+      overflow: auto;
+    }
+
     textarea {
       font-family: $session-font-default;
       min-height: $composition-container-height / 3;
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 63ce1b3fd..9b27809e7 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -318,7 +318,7 @@ export async function TEST_testGuardNode(snode: Data.Snode) {
     response = await insecureNodeFetch(url, fetchOptions);
   } catch (e) {
     if (e.type === 'request-timeout') {
-      window?.log?.warn('test timeout for node,', snode);
+      window?.log?.warn('test timeout for node,', ed25519Str(snode.pubkey_ed25519));
     }
     if (e.code === 'ENETUNREACH') {
       window?.log?.warn('no network on node,', snode);
@@ -392,8 +392,7 @@ export async function selectGuardNodes(): Promise<Array<Data.Snode>> {
     attempts++;
   }
 
-  guardNodes = selectedGuardNodes;
-
+  guardNodes = selectedGuardNodes.slice(0, desiredGuardCount);
   if (guardNodes.length < desiredGuardCount) {
     window?.log?.error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`);
     throw new Error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`);