diff --git a/packages/fdc3-get-agent/src/index.ts b/packages/fdc3-get-agent/src/index.ts
index 5d327b504..5dece7ca9 100644
--- a/packages/fdc3-get-agent/src/index.ts
+++ b/packages/fdc3-get-agent/src/index.ts
@@ -1,9 +1,21 @@
 import { DesktopAgent } from '@finos/fdc3-standard';
 import { getAgent } from './strategies/getAgent';
+import { AbstractUIComponent } from './ui/AbstractUIComponent';
+import { DefaultDesktopAgentChannelSelector } from './ui/DefaultDesktopAgentChannelSelector';
+import { DefaultDesktopAgentIntentResolver } from './ui/DefaultDesktopAgentIntentResolver';
+import { NullChannelSelector } from './ui/NullChannelSelector';
+import { NullIntentResolver } from './ui/NullIntentResolver';
 
 const DEFAULT_WAIT_FOR_MS = 20000;
 
-export { getAgent };
+export {
+  getAgent,
+  AbstractUIComponent,
+  DefaultDesktopAgentChannelSelector,
+  DefaultDesktopAgentIntentResolver,
+  NullChannelSelector,
+  NullIntentResolver,
+};
 
 /**
  * Replaces the original fdc3Ready function from FDC3 2.0 with a new one that uses the new getAgent function.
diff --git a/toolbox/fdc3-for-web/fdc3-web-impl/src/directory/DirectoryInterface.ts b/toolbox/fdc3-for-web/fdc3-web-impl/src/directory/DirectoryInterface.ts
index de6ac9c16..29778f6d2 100644
--- a/toolbox/fdc3-for-web/fdc3-web-impl/src/directory/DirectoryInterface.ts
+++ b/toolbox/fdc3-for-web/fdc3-web-impl/src/directory/DirectoryInterface.ts
@@ -1,4 +1,4 @@
-import { components } from '../directory-schema';
+import { components } from '../../generated/directory-schema';
 
 type schemas = components['schemas'];