diff --git a/core/os_linux.odin b/core/os_linux.odin
index 1bfb3c428..c44f72bc9 100644
--- a/core/os_linux.odin
+++ b/core/os_linux.odin
@@ -271,7 +271,7 @@ dlerror :: proc() -> string {
 _alloc_command_line_arguments :: proc() -> []string {
 	args := make([]string, __argc__);
 	for i in 0..__argc__ {
-		args[i] = string((__argv__+i)^);
+		args[i] = string(cstring((__argv__+i)^));
 	}
 	return args;
 }
diff --git a/src/main.cpp b/src/main.cpp
index f2fde5dc8..1e852102b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -983,7 +983,7 @@ int main(int arg_count, char **arg_ptr) {
 		remove_temp_files(output_base);
 
 		if (run_output) {
-			system_exec_command_line_app("odin run", false, "%.*s", LIT(output_base));
+			system_exec_command_line_app("odin run", false, "%s/%.*s", cwd, LIT(output_base));
 		}
 	#endif