diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
index 271d4788384..6325f0c2f5c 100644
--- a/design-system/packages/modals/src/DrawerController.tsx
+++ b/design-system/packages/modals/src/DrawerController.tsx
@@ -28,9 +28,11 @@ export const DrawerController = ({ isOpen, children }: DrawerControllerProps) =>
   return (
     <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150} nodeRef={nodeRef}>
       {transitionState => (
-        <DrawerControllerContextProvider value={transitionState} ref={nodeRef}>
-          {children}
-        </DrawerControllerContextProvider>
+        <div ref={nodeRef}>
+          <DrawerControllerContextProvider value={transitionState}>
+            {children}
+          </DrawerControllerContextProvider>
+        </div>
       )}
     </Transition>
   )
diff --git a/examples/custom-session-invalidation/keystone.ts b/examples/custom-session-invalidation/keystone.ts
index c370fc70c71..c330c46ed1d 100644
--- a/examples/custom-session-invalidation/keystone.ts
+++ b/examples/custom-session-invalidation/keystone.ts
@@ -70,7 +70,7 @@ function withSessionInvalidation (config: Config<Session>): Config<Session> {
 
 export default withSessionInvalidation(
   withAuth(
-    config<TypeInfo>({
+    config({
       db: {
         provider: 'sqlite',
         url: process.env.DATABASE_URL || 'file:./keystone-example.db',
@@ -83,4 +83,4 @@ export default withSessionInvalidation(
       session: statelessSessions<Session>(),
     })
   )
-)
+) as any as TypeInfo;
diff --git a/packages/core/src/scripts/build.ts b/packages/core/src/scripts/build.ts
index 14ddbb1f990..8d0e19b6928 100644
--- a/packages/core/src/scripts/build.ts
+++ b/packages/core/src/scripts/build.ts
@@ -50,6 +50,7 @@ export async function build (
     undefined,
     undefined,
     undefined,
-    'default'
+    'default',
+    undefined,
   )
 }
diff --git a/packages/fields-document/src/DocumentEditor/component-blocks/component-block-render.tsx b/packages/fields-document/src/DocumentEditor/component-blocks/component-block-render.tsx
index 66d0bc14749..8ca3c12d7b2 100644
--- a/packages/fields-document/src/DocumentEditor/component-blocks/component-block-render.tsx
+++ b/packages/fields-document/src/DocumentEditor/component-blocks/component-block-render.tsx
@@ -42,7 +42,7 @@ export function ComponentBlockRender ({
 
   const childrenByPath: Record<string, ReactElement> = {}
   let maybeChild: ReactElement | undefined
-  children.forEach((child: ReactElement) => {
+  children.forEach((child: ReactElement<any>) => {
     const propPath = child.props.children.props.element.propPath
     if (propPath === undefined) {
       maybeChild = child