diff --git a/.vscode/launch.json b/.vscode/launch.json
index f6f94ae..f99a047 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,7 +3,7 @@
     "configurations":
     [
         {
-            "name": "Run lxc",
+            "name": "Debug lxc [Linux]",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceRoot}/lxc",
@@ -14,8 +14,44 @@
             "externalConsole": true,
 
             "preLaunchTask": "build",
+            "MIMode": "gdb",
 
-            "windows": { "MIMode": "cppvsdbg", },
+            "setupCommands":
+            [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": false
+                }
+            ]
+        },
+
+        {
+            "name": "Debug lxc [Win64]",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/lxc",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+
+            "preLaunchTask": "build"
+        },
+
+        {
+            "name": "Debug LXC_Tests [Linux]",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/LXC_Tests",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+
+            "preLaunchTask": "build",
             "linux": { "MIMode": "gdb" },
 
             "setupCommands":
@@ -29,8 +65,8 @@
         },
 
         {
-            "name": "Run LXC_Tests",
-            "type": "cppdbg",
+            "name": "Debug LXC_Tests [Win64]",
+            "type": "cppvsdbg",
             "request": "launch",
             "program": "${workspaceRoot}/LXC_Tests",
             "args": [],
@@ -40,18 +76,6 @@
             "externalConsole": true,
 
             "preLaunchTask": "build",
-            
-            "windows": { "MIMode": "cppvsdbg", },
-            "linux": { "MIMode": "gdb" },
-
-            "setupCommands":
-            [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": false
-                }
-            ]
-        }
+        },
     ]
 }
diff --git a/ast/src/NodeTypes.cpp b/ast/src/NodeTypes.cpp
index 8bec3b7..ee5f7a8 100644
--- a/ast/src/NodeTypes.cpp
+++ b/ast/src/NodeTypes.cpp
@@ -37,6 +37,6 @@ namespace PashaBibko::LXC::AST
     {}
 
     ReturnStatement::ReturnStatement(NodeValuePtr& value)
-        : Node(NodeType::ReturnVal), m_ReturnValue(std::move(m_ReturnValue))
+        : Node(NodeType::ReturnVal), m_ReturnValue(std::move(value))
     {}
 }