diff --git a/stepmania/src/global.h b/stepmania/src/global.h
index 39df57a997..64a3f629ed 100644
--- a/stepmania/src/global.h
+++ b/stepmania/src/global.h
@@ -116,7 +116,9 @@ void NORETURN sm_crash( const char *reason = "Internal error" );
 
 void ShowWarningOrTrace( const char *file, int line, const char *message, bool bWarning ); // don't pull in LOG here
 #define WARN(MESSAGE) (ShowWarningOrTrace(__FILE__, __LINE__, MESSAGE, true))
+#if !defined(CO_EXIST_WITH_MFC)
 #define TRACE(MESSAGE) (ShowWarningOrTrace(__FILE__, __LINE__, MESSAGE, false))
+#endif
 
 #ifdef DEBUG
 #define DEBUG_ASSERT(x)		ASSERT(x)
diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp
index e0d8075666..eafe76bd18 100644
--- a/stepmania/src/smpackage/MainMenuDlg.cpp
+++ b/stepmania/src/smpackage/MainMenuDlg.cpp
@@ -218,7 +218,7 @@ void MainMenuDlg::OnBnClickedOpenPreferences()
 {
 	// TODO: Add your control notification handler code here
 	// TODO: Have RageFile* do the mapping to the OS file location.
-	RString sPreferencesOSFile = SpecialDirs::GetMyDocumentsDir() + PRODUCT_ID + "/" + SpecialFiles::PREFERENCES_INI_PATH;
+	RString sPreferencesOSFile = SpecialDirs::GetAppDataDir() + PRODUCT_ID + "/" + SpecialFiles::PREFERENCES_INI_PATH;
 	HINSTANCE hinst = ::ShellExecute( this->m_hWnd, "open", sPreferencesOSFile, "", "", SW_SHOWNORMAL );
 	if( (int)hinst == SE_ERR_FNF )
 		Dialog::OK( ssprintf(DOESNT_EXIST_IT_WILL_BE_CREATED.GetValue(),sPreferencesOSFile.c_str()) );
diff --git a/stepmania/src/smpackage/smpackage.cpp b/stepmania/src/smpackage/smpackage.cpp
index 397240ba75..b3e2ed27b3 100644
--- a/stepmania/src/smpackage/smpackage.cpp
+++ b/stepmania/src/smpackage/smpackage.cpp
@@ -120,7 +120,7 @@ BOOL CSmpackageApp::InitInstance()
 		CString sArg = argv[i];
 		if( sArg == "--machine-profile-stats" )
 		{
-			RString sOSFile = SpecialDirs::GetMyDocumentsDir() + PRODUCT_ID +"/Save/MachineProfile/Stats.xml";
+			RString sOSFile = SpecialDirs::GetAppDataDir() + PRODUCT_ID +"/Save/MachineProfile/Stats.xml";
 			HINSTANCE hinst = ::ShellExecute( NULL, "open", sOSFile, "", "", SW_SHOWNORMAL );
 			// See MSDN for an explanation of this return value
 			if( (int)hinst == SE_ERR_FNF )