diff --git a/packages/frontend-shared/README.md b/packages/frontend-shared/README.md
index c313f362ecef..760f316076be 100644
--- a/packages/frontend-shared/README.md
+++ b/packages/frontend-shared/README.md
@@ -142,7 +142,7 @@ Our GraphQL frontend client is [urql](https://formidable.com/open-source/urql/)
 By convention, we use a prop named `gql` to represent the source of data, so it is common to see things like `props.gql.currentProject`.
 
 ### Use of GraphQL by shared components is limited to `src/gql-components`
-In the long run, files in the `src/components` directory are intended as the foundation of a design system. As such they may be used in many contexts other than the Cypress App and Launchpad. There are some components that are only intended to be shared between App and Launchpad and make use of GraphQL queries and mutations. These will only work correctly if placed within `src/gql-components` directory, because only that directory is specified in [graphql-codegen.yml](graphql-codegen.yml). This is intended to maintain the separation between genuinely reusable components driven by props and events, and gql-driven components that are tightly bound to the implementation of App and Launchpad.
+In the long run, files in the `src/components` directory are intended as the foundation of a design system. As such they may be used in many contexts other than the Cypress App and Launchpad. There are some components that are only intended to be shared between App and Launchpad and make use of GraphQL queries and mutations. These will only work correctly if placed within `src/gql-components` directory, because only that directory is specified in [graphql-codegen.yml](../graphql/graphql-codegen.yml). This is intended to maintain the separation between genuinely reusable components driven by props and events, and gql-driven components that are tightly bound to the implementation of App and Launchpad.
 
 ## Generating Fixtures
 
diff --git a/packages/graphql/src/utils/index.ts b/packages/graphql/src/utils/index.ts
index bc5e2c071e78..42e534a48cb3 100644
--- a/packages/graphql/src/utils/index.ts
+++ b/packages/graphql/src/utils/index.ts
@@ -2,3 +2,4 @@
 // created by autobarrel, do not modify directly
 
 export * from './graphqlTypeUtils'
+export * from './nexusTypegenUtils'
diff --git a/scripts/gulp/gulpfile.ts b/scripts/gulp/gulpfile.ts
index 2bbfd0fdbc0d..70f7255f0c7e 100644
--- a/scripts/gulp/gulpfile.ts
+++ b/scripts/gulp/gulpfile.ts
@@ -143,9 +143,6 @@ gulp.task('watchForE2E', gulp.series(
 *------------------------------------------------------------------------**/
 
 gulp.task('cyRunLaunchpadE2E', gulp.series(
-  // 1. Build the Cypress App itself
-  'buildProd',
-
   // Ensure we have no existing cypress processes running
   killExistingCypress,
 
@@ -156,9 +153,6 @@ gulp.task('cyRunLaunchpadE2E', gulp.series(
 ))
 
 gulp.task('cyRunAppE2E', gulp.series(
-  // 1. Build the Cypress App itself
-  'buildProd',
-
   killExistingCypress,
 
   // 5. Start the REAL Cypress App, which will execute the integration specs.
diff --git a/scripts/gulp/tasks/gulpGraphql.ts b/scripts/gulp/tasks/gulpGraphql.ts
index e40440499888..4de7d3873e9a 100644
--- a/scripts/gulp/tasks/gulpGraphql.ts
+++ b/scripts/gulp/tasks/gulpGraphql.ts
@@ -36,14 +36,14 @@ export async function nexusCodegenWatch () {
 
 export async function graphqlCodegen () {
   return spawned('gql-codegen', 'yarn graphql-codegen --config graphql-codegen.yml', {
-    cwd: monorepoPaths.root,
+    cwd: monorepoPaths.pkgGraphql,
     waitForExit: true,
   })
 }
 
 export async function graphqlCodegenWatch () {
   const spawned = universalSpawn('graphql-codegen', ['--watch', '--config', 'graphql-codegen.yml'], {
-    cwd: monorepoPaths.root,
+    cwd: monorepoPaths.pkgGraphql,
   })
   const dfd = pDefer()
   let hasResolved = false