diff --git a/completion/_balena b/completion/_balena
index 0fb31492..eb331943 100644
--- a/completion/_balena
+++ b/completion/_balena
@@ -8,7 +8,7 @@ _balena() {
   local context state line curcontext="$curcontext"
 
   # Valid top-level completions
-  main_commands=( api-key api-keys app block build config deploy device device devices env envs fleet fleet fleets internal join key key keys leave local login logout logs notes orgs os preload push release release releases scan settings ssh support tag tags tunnel util version whoami )
+  main_commands=( api-key api-keys app block build config deploy device devices env envs fleet fleets internal join key keys leave local login logout logs notes orgs os preload push release releases scan settings ssh support tag tags tunnel util version whoami )
   # Sub-completions
   api_key_cmds=( generate revoke )
   app_cmds=( create )
diff --git a/completion/balena-completion.bash b/completion/balena-completion.bash
index 82185b40..3c1101a1 100644
--- a/completion/balena-completion.bash
+++ b/completion/balena-completion.bash
@@ -7,7 +7,7 @@ _balena_complete()
   local cur prev
 
   # Valid top-level completions
-  main_commands="api-key api-keys app block build config deploy device device devices env envs fleet fleet fleets internal join key key keys leave local login logout logs notes orgs os preload push release release releases scan settings ssh support tag tags tunnel util version whoami"
+  main_commands="api-key api-keys app block build config deploy device devices env envs fleet fleets internal join key keys leave local login logout logs notes orgs os preload push release releases scan settings ssh support tag tags tunnel util version whoami"
   # Sub-completions
   api_key_cmds="generate revoke"
   app_cmds="create"
diff --git a/completion/generate-completion.js b/completion/generate-completion.js
index 69e25b84..732ffb83 100644
--- a/completion/generate-completion.js
+++ b/completion/generate-completion.js
@@ -33,7 +33,7 @@ const commandsJson = JSON.parse(fs.readFileSync(commandsFilePath, 'utf8'));
 
 const mainCommands = [];
 const additionalCommands = [];
-for (const key of Object.keys(commandsJson.commands)) {
+for (const key of Object.keys(commandsJson.commands).sort()) {
 	const cmd = key.split(':');
 	if (cmd.length > 1) {
 		additionalCommands.push(cmd);
diff --git a/patches/all/oclif+4.14.0.patch b/patches/all/oclif+4.14.0.dev.patch
similarity index 93%
rename from patches/all/oclif+4.14.0.patch
rename to patches/all/oclif+4.14.0.dev.patch
index 6e325d54..687ef761 100644
--- a/patches/all/oclif+4.14.0.patch
+++ b/patches/all/oclif+4.14.0.dev.patch
@@ -16,7 +16,7 @@ index ef7f90e..8264b7c 100644
    File /r bin
    File /r client
 diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
-index 14d5a6e..07050bc 100644
+index 14d5a6e..7b42a6f 100644
 --- a/node_modules/oclif/lib/tarballs/build.js
 +++ b/node_modules/oclif/lib/tarballs/build.js
 @@ -200,6 +200,13 @@ const extractCLI = async (tarball, c) => {
@@ -28,7 +28,7 @@ index 14d5a6e..07050bc 100644
 +    // `bin` folder may contain a `.fast-boot.json` file of a dev installation.
 +    // This has previously led to issues preventing the CLI from starting, so
 +    // delete `.fast-boot.json` (if any) from the destination folder.
-+    await fs.promises.rm(path.join(c.workspace(), 'bin', '.fast-boot.json'));
++    await (0, fs_extra_1.remove)(path.join(workspace, 'bin', '.fast-boot.json'));
 +
  };
  const buildTarget = async (target, c, options) => {