diff --git a/backend/matching-service/src/matchingService.ts b/backend/matching-service/src/matchingService.ts
index 943e6e7ae9..32265bb674 100644
--- a/backend/matching-service/src/matchingService.ts
+++ b/backend/matching-service/src/matchingService.ts
@@ -145,13 +145,9 @@ export async function handleUserRequestWithRelaxedConstraints(userRequest: any)
     // Update both clients about the successful match
     io.to(currentUserRecord.socketId).emit("matched", {
       matchedWith: existingMatch.userId,
-      roomNumber,
-      questionId: question.questionId,
     });
     io.to(existingMatch.socketId).emit("matched", {
       matchedWith: userId,
-      roomNumber,
-      questionId: question.questionId,
     });
 
     sendConfirmDelayedTimeoutMessage(currentUserRecord.recordId.toString());
diff --git a/frontend/src/components/CodeContainer/CodeContainer.tsx b/frontend/src/components/CodeContainer/CodeContainer.tsx
index 153b0028ea..6cf2e0ac4b 100644
--- a/frontend/src/components/CodeContainer/CodeContainer.tsx
+++ b/frontend/src/components/CodeContainer/CodeContainer.tsx
@@ -367,7 +367,7 @@ const CodeContainer: React.FC<CodeContainerProps> = ({
         if (submissionIndex !== -1) {
           return {
             ...tc,
-            actualOutput: outputs[submissionIndex],
+            actualOutput: outputs[submissionIndex + givenTestCases.length],
           };
         }
         return tc;