diff --git a/build_game.sh b/build_game.sh
index 651993f6..35099ffb 100755
--- a/build_game.sh
+++ b/build_game.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -e
-SCRIPT_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PATH="$SCRIPT_LOCATION"/bin:"$PATH"
+SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
+PATH="$SCRPATH"/bin:"$PATH"
 
-if [ -f "$SCRIPT_LOCATION"/bin/fteqcc ]; then
+if [ -f "$SCRPATH"/bin/fteqcc ]; then
 	cd ./src
 	make
 else
diff --git a/nuclide b/nuclide
index def188e4..7b0df0aa 100755
--- a/nuclide
+++ b/nuclide
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -e
-SCRIPT_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PATH="$SCRIPT_LOCATION"/bin:"$PATH"
+SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
+PATH="$SCRPATH"/bin:"$PATH"
 
-if [ -f "$SCRIPT_LOCATION"/bin/fteqw ]; then
+if [ -f "$SCRPATH"/bin/fteqw ]; then
 	fteqw -manifest valve.fmf $*
 else
 	printf "Engine is not present, please run build_engine.sh\n"
diff --git a/nuclide-ds b/nuclide-ds
index 0e788784..7dda75c1 100755
--- a/nuclide-ds
+++ b/nuclide-ds
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -e
-SCRIPT_LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PATH="$SCRIPT_LOCATION"/bin:"$PATH"
+SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
+PATH="$SCRPATH"/bin:"$PATH"
 
-if [ -f "$SCRIPT_LOCATION"/bin/fteqw-sv ]; then
+if [ -f "$SCRPATH"/bin/fteqw-sv ]; then
 	fteqw-sv -manifest valve.fmf $*
 else
 	printf "Engine is not present, please run build_engine.sh\n"
diff --git a/src/gs-entbase/shared/baseentity.cpp b/src/gs-entbase/shared/baseentity.cpp
index 97be66a9..f6ab702e 100644
--- a/src/gs-entbase/shared/baseentity.cpp
+++ b/src/gs-entbase/shared/baseentity.cpp
@@ -28,13 +28,9 @@ void
 CBaseEntity::RenderFXPass(void)
 {
 	vector vecPlayer;
-#ifdef WASTES
-	vecPlayer = [0,0,0];
-#else
 	int s = (float)getproperty(VF_ACTIVESEAT);
 	pSeat = &g_seats[s];
 	vecPlayer = pSeat->m_vecPredictedOrigin;
-#endif
 
 	colormod = m_vecRenderColor;
 	alpha = m_flRenderAmt;
diff --git a/vmap b/vmap
index 5dabbe15..23b26caf 100755
--- a/vmap
+++ b/vmap
@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
 PATH="$SCRPATH"/bin:"$PATH"
 
 if [ ! -f "$SCRPATH"/bin/vmap ]; then
@@ -7,14 +7,14 @@ if [ ! -f "$SCRPATH"/bin/vmap ]; then
 	exit
 fi
 
-vmap -v -custinfoparms -fs_basepath "$SCRPATH" -fs_game platform -threads 4 -samplesize 8 $*
+"$SCRPATH"/bin/vmap -v -custinfoparms -fs_basepath "$SCRPATH" -fs_game platform -threads 4 -samplesize 8 $*
 
 if [ ! -f "$*.prt" ]; then
 	exit
 fi
 
-vmap -vis -v -fs_basepath "$SCRPATH" -fs_game platform $*
-vmap -light -custinfoparms -fs_basepath "$SCRPATH" -v -fs_game platform -bounce 8 -fastbounce -samplesize 8 -threads 4 -shade -shadeangle 60 -patchshadows $*
+"$SCRPATH"/bin/vmap -vis -v -fs_basepath "$SCRPATH" -fs_game platform $*
+"$SCRPATH"/bin/vmap -light -custinfoparms -fs_basepath "$SCRPATH" -v -fs_game platform -bounce 8 -fastbounce -samplesize 8 -threads 4 -shade -shadeangle 60 -patchshadows $*
 
 
 
diff --git a/worldspawn b/worldspawn
index 0b3e89b4..0cb32c0e 100755
--- a/worldspawn
+++ b/worldspawn
@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SCRPATH="$( cd "$( dirname $(readlink -nf $0) )" && pwd )"
 PATH="$SCRPATH"/bin:"$PATH"
 
 if [ ! -f "$SCRPATH"/bin/worldspawn ]; then