diff --git a/data/AppRun_java b/data/AppRun_java
index 6584d4c..367e648 100755
--- a/data/AppRun_java
+++ b/data/AppRun_java
@@ -15,10 +15,8 @@ BINARY_ARGS="-jar _BINARY_"
 #eval arguments="$(patch_relative_paths "$@")"
 #set -- "${arguments[@]}"
 
-cd "$APPDIR"
-
-export PATH="$PWD/jre1.7.0_17/bin:${PATH}"
-export LD_LIBRARY_PATH="$PWD/jre1.7.0_17/lib/i386:${LD_LIBRARY_PATH}"
+export PATH="$APPDIR/jre1.7.0_17/bin:${PATH}"
+export LD_LIBRARY_PATH="$APPDIR/jre1.7.0_17/lib/i386:${LD_LIBRARY_PATH}"
 
 [ -z "$*" ] && show_usage "usage.txt"
 
diff --git a/data/AppRun_linker b/data/AppRun_linker
index 7d2af51..0efa720 100755
--- a/data/AppRun_linker
+++ b/data/AppRun_linker
@@ -15,16 +15,14 @@ BINARY_ARGS=
 #eval arguments="$(patch_relative_paths "$@")"
 #set -- "${arguments[@]}"
 
-cd "$APPDIR"
-
-export PATH="$PWD/usr/bin/:$PATH"
+export PATH="$APPDIR/usr/bin/:$PATH"
 
 [ -z "$*" ] && show_usage "usage.txt"
 
 setup_keepResolution
 
 ret=0
-cd usr/
+cd "$APPDIR/usr/"
 {
 	export RUNELF_HELPERS="$APPDIR/usr/lib/ld-linux.so.2"
 	run_withLocalLibs $APPRUN_HELPERS $RUNELF_HELPERS "$BINARY" $BINARY_ARGS "$@"
diff --git a/data/AppRun_quick b/data/AppRun_quick
index 3d50336..23a3f7e 100755
--- a/data/AppRun_quick
+++ b/data/AppRun_quick
@@ -6,7 +6,7 @@ export APPDIR="$(dirname "$(readlink -f "$0")")"
 export APPPKG="$(basename "$APPIMAGE")"
 LOGFILE=$(mktemp "/tmp/AppRun-log-${APPPKG}.XXXXXXXXXX")
 
-BINARY="./_BINARY_"
+BINARY="$APPDIR/_BINARY_"
 BINARY_ARGS=
 
 . "$APPDIR/util.sh"
@@ -15,9 +15,7 @@ BINARY_ARGS=
 #eval arguments="$(patch_relative_paths "$@")"
 #set -- "${arguments[@]}"
 
-cd "$APPDIR"
-
-export PATH="$PWD/usr/bin/:$PATH"
+export PATH="$APPDIR/usr/bin/:$PATH"
 
 [ -z "$*" ] && show_usage "usage.txt"
 
diff --git a/data/AppRun_testing b/data/AppRun_testing
index c4691b1..3f88cce 100755
--- a/data/AppRun_testing
+++ b/data/AppRun_testing
@@ -15,9 +15,7 @@ BINARY_ARGS=
 #eval arguments="$(patch_relative_paths "$@")"
 #set -- "${arguments[@]}"
 
-cd "$APPDIR"
-
-export PATH="$PWD/usr/bin/:$PATH"
+export PATH="$APPDIR/usr/bin/:$PATH"
 
 [ -z "$*" ] && show_usage "usage.txt"
 
diff --git a/data/AppRun_wine b/data/AppRun_wine
index 9cb66fd..1243872 100755
--- a/data/AppRun_wine
+++ b/data/AppRun_wine
@@ -16,9 +16,7 @@ WINETRICKS=
 #eval arguments="$(patch_relative_paths "$@")"
 #set -- "${arguments[@]}"
 
-cd "$APPDIR"
-
-export PATH="$PWD/usr/bin/:${PATH}"
+export PATH="$APPDIR/usr/bin/:${PATH}"
 
 [ -z "$*" ] && show_usage "usage.txt"