Index: src/ch/ch.cpp
===================================================================
diff -u -rdb26c9ac6945d5c754c3460dd55bd6d53e2c9e7e -r58de8d7360813537b384eff808c031f9e63db4de
--- src/ch/ch.cpp	(.../ch.cpp)	(revision db26c9ac6945d5c754c3460dd55bd6d53e2c9e7e)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision 58de8d7360813537b384eff808c031f9e63db4de)
@@ -69,7 +69,7 @@
 						0xac6e, 0x1e4c, 0x5667, 0x1942, 0x0a47, 0x1f80, 0x4191, 0x4f8d };
 
 int iOffCount=12;
-unsigned char off[]={ 2, 6, 3, 4, 8, 0, 1, 3, 2, 4, 1, 6 };
+unsigned char _off[]={ 2, 6, 3, 4, 8, 0, 1, 3, 2, 4, 1, 6 };
 unsigned short _hash[]={ 0x3fad, 0x34cd, 0x7fff, 0x65ff, 0x4512, 0x0112, 0xabac, 0x1abc, 0x54ab, 0x1212, 0x0981, 0x0100 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@
 	rResManager.Init(AfxGetInstanceHandle());
 	rResManager.SetCallback(ResManCallback);
 	GetPropValue<PP_PLANGUAGE>(rCfg, strPath);
-	TRACE(_T("Help path=%s\n"), strPath);
+	TRACE(_T("Help path=%s\n"), (PCTSTR)strPath);
 	if(!rResManager.SetLanguage(m_pathProcessor.ExpandPath(strPath)))
 	{
 		TCHAR szData[2048];
@@ -325,17 +325,6 @@
 
 	EnableHtmlHelp();
 
-	// ================================= Handle early command line options ========================================
-	if(m_cmdLineParser.HasCommandLineParams() && m_cmdLineParser.HasSystemStartupOption())
-	{
-		SetPropValue<PP_PRELOADAFTERRESTART>(rCfg, m_cmdLineParser.IsSystemStartupEnabled());
-		rCfg.Write();
-
-		SetAutorun(GetPropValue<PP_PRELOADAFTERRESTART>(rCfg));
-
-		return FALSE;
-	}
-
 	// ================================= Checking for running instances of CH ========================================
 	// check instance - return false if it's the second one
 	LOG_INFO(m_spLog) << _T("Checking for other running instances of Copy Handler");