diff --git a/build_editor.sh b/build_editor.sh
index 5a90ba52..b52352ea 100755
--- a/build_editor.sh
+++ b/build_editor.sh
@@ -83,7 +83,7 @@ then
 	gmake clean
 fi
 
-CC=$WS_CC CXX=$WS_CXX CFLAGS="$WS_CFLAGS" LDFLAGS="$WS_LDFLAGS" gmake -j $BUILD_PROC
+gmake -j $BUILD_PROC CC=$WS_CC CXX=$WS_CXX CFLAGS="$WS_CFLAGS" LDFLAGS="$WS_LDFLAGS"
 
 mkdir -p ../../bin/bitmaps
 mv_wsfile defaultkeys.ini
diff --git a/build_engine.sh b/build_engine.sh
index f5708e45..0b728d4d 100755
--- a/build_engine.sh
+++ b/build_engine.sh
@@ -122,19 +122,19 @@ fi
 
 if [ "$BUILD_ENGINE_DEPENDENCIES" -eq 1 ]
 then
-	CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC makelibs FTE_TARGET=$PLATFORM
+	gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX  makelibs FTE_TARGET=$PLATFORM
 	printf "Built the static dependencies successfully.\n\n"
 fi
 
-CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC $MAKETARGET  CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM
+gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX $MAKETARGET  CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM
 cp -v "$OUTPUT" ../../../bin/fteqw
 printf "Built the client engine successfully.\n\n"
 
-CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC sv-dbg
+gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX sv-dbg
 cp -v ./debug/fteqw-sv ../../../bin/fteqw-sv
 printf "Built the dedicated server successfully.\n\n"
 
-CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC qcc-rel
+gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX qcc-rel
 cp -v ./release/fteqcc ../../../bin/fteqcc
 printf "Built the QuakeC compiler successfully.\n\n"
 
diff --git a/build_tools.sh b/build_tools.sh
index bf03948a..e57c9236 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -65,7 +65,7 @@ then
 	gmake clean
 fi
 
-CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC
+gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX
 printf "Built vvmtool successfully.\n"
 cp -v vvmtool ../../bin/vvmtool
 printf "DONE. Built ALL components successfully.\n"
diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc
index 31437c96..549dd077 100644
--- a/src/gs-entbase/shared/ambient_generic.qc
+++ b/src/gs-entbase/shared/ambient_generic.qc
@@ -21,7 +21,7 @@ Plays a sound sample of whatever format the engine is configured to support.
 "targetname" : Name
 "target" : Target when triggered.
 "killtarget" : Target to kill when triggered.
-"message" : Sound file to play
+"message" : Sound file to play, or sentences.txt entry if prefixed with a '!'
 "volume" : Playback volume from 0.0 to 1.0
 "pitch" : Playback pitch from 0.0 to 2.0