diff --git a/Makefile b/Makefile
index 7413ac5c..24a17279 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,9 @@ endif
 ifndef BUILD_RENDERER_OPENGL2
   BUILD_RENDERER_OPENGL2=
 endif
+ifndef BUILD_FINAL
+  BUILD_FINAL      =0
+endif
 ifndef BUILD_AUTOUPDATER  # DON'T build unless you mean to!
   BUILD_AUTOUPDATER=0
 endif
@@ -350,6 +353,8 @@ ifeq ($(SDL_CFLAGS),)
   endif
 endif
 
+ifneq ($(BUILD_FINAL),1)
+
 # Add git version info
 USE_GIT=
 ifeq ($(wildcard .git),.git)
@@ -360,6 +365,8 @@ ifeq ($(wildcard .git),.git)
   endif
 endif
 
+endif
+
 
 #############################################################################
 # SETUP AND BUILD -- LINUX
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index d0e75596..e08fed01 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2788,9 +2788,6 @@ void Com_Init( char *commandLine ) {
 	if ( !com_homepath->string[0] ) {
 		Cvar_ForceReset( "com_homepath" );
 	}
-	
-	if(!com_basegame->string[0])
-		Cvar_ForceReset("com_basegame");
 
 	FS_InitFilesystem ();
 
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index c58755ef..84d73f8a 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -27,10 +27,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // A user mod should never modify this file
 
 #ifdef STANDALONE
-  #define PRODUCT_NAME			"iofoo3"
-  #define BASEGAME			"foobar"
-  #define CLIENT_WINDOW_TITLE     	"changeme"
-  #define CLIENT_WINDOW_MIN_TITLE 	"changeme2"
+  #define PRODUCT_NAME				"iofoo3"
+  #define BASEGAME					"foobar"
+  #define CLIENT_WINDOW_TITLE		"changeme"
+  #define CLIENT_WINDOW_MIN_TITLE	"changeme2"
 
   // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
   // MacOS: $HOME/Library/Application Support/Homepath Name
@@ -44,10 +44,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   #define CINEMATICS_INTRO		"intro.roq"
 //  #define LEGACY_PROTOCOL	// You probably don't need this for your standalone game
 #elif defined ELITEFORCE
-  #define PRODUCT_NAME			"Lilium Voyager HM"
-  #define BASEGAME			"baseEF"
-  #define CLIENT_WINDOW_TITLE     	"Lilium Voyager Holomatch"
-  #define CLIENT_WINDOW_MIN_TITLE 	"liliumvoy"
+  #define PRODUCT_NAME				"Lilium Voyager HM"
+  #define BASEGAME					"baseEF"
+  #define CLIENT_WINDOW_TITLE		"Lilium Voyager Holomatch"
+  #define CLIENT_WINDOW_MIN_TITLE	"liliumvoy"
 
   // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
   // MacOS: $HOME/Library/Application Support/Homepath Name
@@ -62,10 +62,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   //#define CINEMATICS_INTRO		"intro.bik"
   #define LEGACY_PROTOCOL
 #else
-  #define PRODUCT_NAME			"ioq3"
-  #define BASEGAME			"baseq3"
-  #define CLIENT_WINDOW_TITLE     	"ioquake3"
-  #define CLIENT_WINDOW_MIN_TITLE 	"ioq3"
+  #define PRODUCT_NAME				"ioq3"
+  #define BASEGAME					"baseq3"
+  #define CLIENT_WINDOW_TITLE		"ioquake3"
+  #define CLIENT_WINDOW_MIN_TITLE	"ioq3"
 
   // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
   // MacOS: $HOME/Library/Application Support/Homepath Name