diff --git a/core/cfg/cl.cpp b/core/cfg/cl.cpp
index 44b6de381..49ccf17e5 100644
--- a/core/cfg/cl.cpp
+++ b/core/cfg/cl.cpp
@@ -9,7 +9,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#ifndef linux
+#if !defined(linux) && !defined(_ANDROID)
 #include <conio.h>
 #endif
 
diff --git a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp
index 15ed5bea3..5394e207f 100644
--- a/core/linux-dist/main.cpp
+++ b/core/linux-dist/main.cpp
@@ -383,7 +383,7 @@ int main(int argc, wchar* argv[])
 
 
 	if(ParseCommandLine(argc,argv)) {
-		return 69;
+		return rv_cli_finish;
 	}
 
 	/* Set directories */
diff --git a/core/types.h b/core/types.h
index 6aa8a3c6c..cdfde6ce4 100644
--- a/core/types.h
+++ b/core/types.h
@@ -302,10 +302,11 @@ struct vram_block
 
 enum ndc_error_codes
 {
-	rv_ok = 0,		//no error
+	rv_ok = 0,			//no error
+	rv_cli_finish=69,	//clean exit after -help or -version , should we just use rv_ok?
 
-	rv_error=-2,	//error
-	rv_serror=-1,	//silent error , it has been reported to the user
+	rv_error=-2,		//error
+	rv_serror=-1,		//silent error , it has been reported to the user
 };
 
 //Simple struct to store window rect  ;)
diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp
index 49613d709..9a3c557e6 100644
--- a/core/windows/winmain.cpp
+++ b/core/windows/winmain.cpp
@@ -704,7 +704,7 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
 
 
 	if(ParseCommandLine(argc,argv)) {
-		return 69;
+		return rv_cli_finish;
 	}
 
 	ReserveBottomMemory();
diff --git a/shell/reicast.vcxproj b/shell/reicast.vcxproj
index e139e3449..2acc87713 100644
--- a/shell/reicast.vcxproj
+++ b/shell/reicast.vcxproj
@@ -469,7 +469,7 @@
       <Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
     </PreBuildEvent>
     <PreBuildEvent>
-      <Message>Setting Version  git describe &gt;$(ProjectDir)\version.txt &amp;&amp;  set r_ver=%%i &amp;&amp; </Message>
+      <Message>Setting Version # in header</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">
@@ -513,7 +513,7 @@
       <Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
     </PreBuildEvent>
     <PreBuildEvent>
-      <Message>Setting Version  git describe &gt;$(ProjectDir)\version.txt &amp;&amp;  set r_ver=%%i &amp;&amp; </Message>
+      <Message>Setting Version # in header</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">
@@ -544,7 +544,7 @@
       <Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
     </PreBuildEvent>
     <PreBuildEvent>
-      <Message>Setting Version  git describe &gt;$(ProjectDir)\version.txt &amp;&amp;  set r_ver=%%i &amp;&amp; </Message>
+      <Message>Setting Version # in header</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">
@@ -580,7 +580,7 @@
       <Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
     </PreBuildEvent>
     <PreBuildEvent>
-      <Message>Setting Version  git describe &gt;$(ProjectDir)\version.txt &amp;&amp;  set r_ver=%%i &amp;&amp; </Message>
+      <Message>Setting Version # in header</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">