diff --git a/package.json b/package.json
index 48d7e155..584fe582 100644
--- a/package.json
+++ b/package.json
@@ -278,7 +278,8 @@
             },
             {
                 "command": "tolk.getUnresolvedIdentifiers",
-                "title": "Tolk: Get Unresolved Identifiers"
+                "title": "Tolk: Get Unresolved Identifiers",
+                "category": "Tolk"
             },
             {
                 "command": "ton.debug",
diff --git a/server/src/e2e/tolk/compiler-tests.test.ts b/server/src/e2e/tolk/compiler-tests.test.ts
index d8522d96..86f4590d 100644
--- a/server/src/e2e/tolk/compiler-tests.test.ts
+++ b/server/src/e2e/tolk/compiler-tests.test.ts
@@ -43,8 +43,6 @@ suite("Compiler Tests Suite", () => {
             )
             const tolkFiles = glob.sync(testCasesPath, {windowsPathsNoEscape: true})
 
-            console.log("tolkFiles", tolkFiles.length)
-
             for (const tolkFile of tolkFiles) {
                 const testName = path.basename(tolkFile, ".tolk")
 
diff --git a/server/src/languages/tolk/type-inference.ts b/server/src/languages/tolk/type-inference.ts
index 3ae12796..e1945bdf 100644
--- a/server/src/languages/tolk/type-inference.ts
+++ b/server/src/languages/tolk/type-inference.ts
@@ -519,6 +519,7 @@ class InferenceWalker {
     public inferReturnType(): Ty {
         const returnTypes = this.ctx.returnTypes
         if (returnTypes.length === 0) return VoidTy.VOID
+        if (returnTypes.length === 1) return returnTypes[0]
 
         let joined: Ty | null = null
 
@@ -697,7 +698,7 @@ class InferenceWalker {
     }
 
     private processReturnStatement(node: SyntaxNode, flow: FlowContext): FlowContext {
-        const expression = node.child(1)
+        const expression = node.childForFieldName("body")
         if (expression) {
             flow = this.inferExpression(
                 expression,