diff --git a/examples/todo/src/__tests__/helpers.ts b/examples/todo/src/__tests__/helpers.ts
index a9a76ccc9f53..9359e0256b61 100644
--- a/examples/todo/src/__tests__/helpers.ts
+++ b/examples/todo/src/__tests__/helpers.ts
@@ -48,7 +48,7 @@ export function givenTodo(todo?: Partial<Todo>) {
 
 export const aLocation = {
   address: '1 New Orchard Road, Armonk, 10504',
-  geopoint: <GeoPoint>{y: 41.109728357749, x: -73.72462031805},
+  geopoint: <GeoPoint>{y: 41.109725723771, x: -73.724620709372},
   get geostring() {
     return `${this.geopoint.y},${this.geopoint.x}`;
   },
diff --git a/examples/webpack/src/__tests__/integration/bundle-web.integration.ts b/examples/webpack/src/__tests__/integration/bundle-web.integration.ts
index 7e1a1be70d02..08d33222fe98 100644
--- a/examples/webpack/src/__tests__/integration/bundle-web.integration.ts
+++ b/examples/webpack/src/__tests__/integration/bundle-web.integration.ts
@@ -39,7 +39,8 @@ skipIf<[(this: Suite) => void], void>(
     let browser: Browser;
     let html: string;
     before(async function (this: Mocha.Context) {
-      this.timeout(15000);
+      // Launching the browser can be slow on CI
+      this.timeout(30000);
       browser = await puppeteer.launch({
         headless: true,
         args: ['--no-sandbox'],
diff --git a/packages/cli/lib/cli.js b/packages/cli/lib/cli.js
index 677b5e66c24d..70ec6c02cf98 100644
--- a/packages/cli/lib/cli.js
+++ b/packages/cli/lib/cli.js
@@ -202,7 +202,7 @@ function main(opts, log) {
         commandOptions[n] = {...opt, type: opt.type.name};
       }
       const commandArgs = [];
-      if (!gen) {
+      if (gen._arguments) {
         for (const arg of gen._arguments) {
           commandArgs.push({...arg, type: arg.type.name});
         }
diff --git a/packages/cli/snapshots/integration/cli/cli.integration.snapshots.js b/packages/cli/snapshots/integration/cli/cli.integration.snapshots.js
index 5db0a8c9c25f..5e71995efce5 100644
--- a/packages/cli/snapshots/integration/cli/cli.integration.snapshots.js
+++ b/packages/cli/snapshots/integration/cli/cli.integration.snapshots.js
@@ -190,6 +190,12 @@ exports[`cli saves command metadata to .yo-rc.json 1`] = `
           "name": "loopbackBuild",
           "hide": false
         },
+        "editorconfig": {
+          "type": "Boolean",
+          "description": "Use preconfigured EditorConfig settings",
+          "name": "editorconfig",
+          "hide": false
+        },
         "vscode": {
           "type": "Boolean",
           "description": "Use preconfigured VSCode settings",
@@ -315,6 +321,12 @@ exports[`cli saves command metadata to .yo-rc.json 1`] = `
           "name": "loopbackBuild",
           "hide": false
         },
+        "editorconfig": {
+          "type": "Boolean",
+          "description": "Use preconfigured EditorConfig settings",
+          "name": "editorconfig",
+          "hide": false
+        },
         "vscode": {
           "type": "Boolean",
           "description": "Use preconfigured VSCode settings",