diff --git a/yarn-project/builder/src/contract-interface-gen/typescript.ts b/yarn-project/builder/src/contract-interface-gen/typescript.ts
index a8fb0ef4a1b..4c2911fba97 100644
--- a/yarn-project/builder/src/contract-interface-gen/typescript.ts
+++ b/yarn-project/builder/src/contract-interface-gen/typescript.ts
@@ -232,7 +232,6 @@ function generateNotesGetter(input: ContractArtifact) {
     .join(',\n');
 
   return `public static get notes(): ContractNotes<${notesUnionType}> {
-    const notes = this.artifact.outputs.globals.notes ? (this.artifact.outputs.globals.notes as any) : [];
     return {
       ${noteMetadata}
     } as ContractNotes<${notesUnionType}>;
diff --git a/yarn-project/foundation/src/abi/abi.ts b/yarn-project/foundation/src/abi/abi.ts
index d242ae50e0f..3dbe2dc7036 100644
--- a/yarn-project/foundation/src/abi/abi.ts
+++ b/yarn-project/foundation/src/abi/abi.ts
@@ -277,7 +277,7 @@ export type ContractNote = {
    */
   id: Fr;
   /**
-   * Type of the note
+   * Type of the note (e.g., 'TransparentNote')
    */
   typ: string;
 };
@@ -291,7 +291,7 @@ export type FieldLayout = {
    */
   slot: Fr;
   /**
-   * Type being stored at the slot
+   * Type being stored at the slot (e.g., 'Map<AztecAddress, PublicMutable<U128>>')
    */
   typ: string;
 };
diff --git a/yarn-project/p2p/src/service/discv5_service.test.ts b/yarn-project/p2p/src/service/discv5_service.test.ts
index 9228e1b87d0..4ce6a233075 100644
--- a/yarn-project/p2p/src/service/discv5_service.test.ts
+++ b/yarn-project/p2p/src/service/discv5_service.test.ts
@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals';
 import type { PeerId } from '@libp2p/interface';
 
 import { BootstrapNode } from '../bootstrap/bootstrap.js';
@@ -21,6 +22,8 @@ const waitForPeers = (node: DiscV5Service, expectedCount: number): Promise<void>
 };
 
 describe('Discv5Service', () => {
+  jest.setTimeout(10_000);
+
   let bootNode: BootstrapNode;
   let bootNodePeerId: PeerId;
   let port = 1234;
diff --git a/yarn-project/simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts
index 91d0dd93a38..b34939ce8ee 100644
--- a/yarn-project/simulator/src/client/private_execution.test.ts
+++ b/yarn-project/simulator/src/client/private_execution.test.ts
@@ -732,7 +732,7 @@ describe('Private Execution test suite', () => {
       const secret = new Fr(1n);
       const secretHash = computeSecretHash(secret);
       const note = new Note([secretHash]);
-      // @todo @LHerskind Need to investigate why this was working with `new Fr(5)` as the `example_set = 2` should have caused a failure.
+      // @todo @LHerskind (#6001) Need to investigate why this was working with `new Fr(5)` as the `example_set = 2` should have caused a failure.
       const storageSlot = TestContractArtifact.storageLayout['example_set'].slot;
       oracle.getNotes.mockResolvedValue([
         {