diff --git a/editors/code/package.json b/editors/code/package.json
index 4d523c8cc6e0..83a987e1d443 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -695,7 +695,7 @@
                     },
                     "rust-analyzer.trace.extension": {
                         "description": "Enable logging of VS Code extensions itself.",
-                        "markdownDeprecationMessage": "Log level is now controlled by the [Developer: Set Log Level...](command:workbench.action.setLogLevel) command.You can set the log level for the current session and also the default log level from there. This is also available by clicking the gear icon on the OUTPUT tab when Rust Analyzer Client is visible or by passing the --log rust-lang.rust-analyzer:debug parameter to VS Code.",
+                        "markdownDeprecationMessage": "Log level is now controlled by the [Developer: Set Log Level...](command:workbench.action.setLogLevel) command. You can set the log level for the current session and also the default log level from there. This is also available by clicking the gear icon on the OUTPUT tab when rust-analyzer Extension is visible or by passing the --log rust-lang.rust-analyzer:debug parameter to VS Code.",
                         "type": "boolean",
                         "default": false
                     }
diff --git a/editors/code/src/bootstrap.ts b/editors/code/src/bootstrap.ts
index 440f21cbe3c5..5a5ddab155d4 100644
--- a/editors/code/src/bootstrap.ts
+++ b/editors/code/src/bootstrap.ts
@@ -21,12 +21,12 @@ export async function bootstrap(
 
     log.info("Using server binary at", path);
 
-    if (!isValidExecutable(path, config.serverExtraEnv)) {
+    if (!(await isValidExecutable(path, config.serverExtraEnv))) {
         throw new Error(
             `Failed to execute ${path} --version.` +
                 (config.serverPath
-                    ? `\`config.server.path\` or \`config.serverPath\` has been set explicitly.\
-            Consider removing this config or making a valid server binary available at that path.`
+                    ? ` \`config.server.path\` or \`config.serverPath\` has been set explicitly.` +
+                      ` Consider removing this config or making a valid server binary available at that path.`
                     : ""),
         );
     }
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index e07fbb8bead6..c6e20259399d 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -287,9 +287,9 @@ export class Ctx implements RustAnalyzerExtensionApi {
             let message = "bootstrap error. ";
 
             message +=
-                'See the logs in "OUTPUT > Rust Analyzer Client" (should open automatically).';
+                'See the logs in "OUTPUT > rust-analyzer Extension" (should open automatically).';
             message +=
-                'To enable verbose logs, click the gear icon in the "OUTPUT" tab and select "Debug".';
+                ' To enable verbose logs, click the gear icon in the "OUTPUT" tab and select "Debug".';
 
             log.error("Bootstrap error", err);
             throw new Error(message);