diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
index d7bed46f..a6c24d8e 100644
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
@@ -9,7 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
-#if !defined(_WINDOWS64) && !defined(_DURANGO) && !defined(__ORBIS__) && !defined(__PS3__) && !defined(__PSVITA__) && !defined(_XBOX)
+#if !defined(_DURANGO) && !defined(_WINDOWS64) && !defined(_XBOX) && !defined(__ORBIS__) // str1k3r - some platforms complain about this, also this wasnt in the leak?
 LeaderboardManager *LeaderboardManager::m_instance = NULL;
 #endif
 
diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp
index c0095d6e..65f07987 100644
--- a/Minecraft.Client/Options.cpp
+++ b/Minecraft.Client/Options.cpp
@@ -116,7 +116,11 @@ void Options::init()
     bobView = true;
     anaglyph3d = false;
     advancedOpengl = false;
+#ifdef _WINDOWS64
     framerateLimit = 0;
+#else
+	framerateLimit = 2;
+#endif
     fancyGraphics = true;
     ambientOcclusion = true;
 	renderClouds = true;