diff --git a/common.py b/common.py
index eebc9d4..f798e1b 100644
--- a/common.py
+++ b/common.py
@@ -1242,7 +1242,7 @@ lunch aosp_{}-eng
                 out += executable_ext
             return out
         else:
-            return in_path_abs
+            return in_path
 
     def resolve_targets(self, source_dir, targets):
         if not targets:
diff --git a/run b/run
index 9155bb4..f27849c 100755
--- a/run
+++ b/run
@@ -718,7 +718,7 @@ Extra options to append at the end of the emulator command line.
                 else:
                     raise Exception('--tmux-program is only supported in gem5 currently.')
             elif self.env['tmux_program'] == 'gdb':
-                tmux_cmd = './run-gdb'
+                tmux_cmd = os.path.join(self.env['root_dir'], 'run-gdb')
                 # TODO find a nicer way to forward all those args automatically.
                 # Part of me wants to: https://github.com/jonathanslenders/pymux
                 # but it cannot be used as a library properly it seems, and it is