diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
index f2875d1cf..7c5a0658e 100644
--- a/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
@@ -21,7 +21,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 	value[0].number = (F64)4;
 #elif defined __PSVITA__
 	value[0].number = (F64)5;
-#elif defined _WINDOWS64
+#elif defined _WINDOWS64 || defined __linux__
 	value[0].number = (F64)0;
 #endif
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
@@ -30,4 +30,4 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 std::wstring UIComponent_DebugUIMarketingGuide::getMoviePath()
 {
 	return L"DebugUIMarketingGuide";
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Platform/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp
index 337aa97cc..43cc941ea 100644
--- a/Minecraft.Client/Platform/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIController.cpp
@@ -566,7 +566,7 @@ void UIController::ReloadSkin()
 		m_iggyLibraries[i] = IGGY_INVALID_LIBRARY;
 	}
 
-#ifdef _WINDOWS64 || defined(__linux__))
+#if defined _WINDOWS64 || defined __linux__
 	// 4J Stu - Don't load on a thread on windows. I haven't investigated this in detail, so a quick fix
 	reloadSkinThreadProc(this);
 #else
@@ -613,7 +613,7 @@ int UIController::reloadSkinThreadProc(void* lpParam)
 	controller->m_groups[eUIGroup_Fullscreen]->ReloadAll();
 
 	// 4J Stu - Don't do this on windows, as we never navigated forwards to start with
-#ifndef _WINDOW64
+#if ! (defined _WINDOWS64 || defined __linux__)
 	controller->NavigateBack(0, false, eUIScene_COUNT, eUILayer_Tooltips);
 #endif
 	LeaveCriticalSection(&ms_reloadSkinCS);
@@ -2546,7 +2546,7 @@ void UIController::setFontCachingCalculationBuffer(int length)
 	draw call is not large enough, Iggy will crash or otherwise behave
 	incorrectly.
 	*/
-#if defined __ORBIS__ || defined _DURANGO || defined _WIN64
+#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __linux__
 	static const int CHAR_SIZE = 24;
 #else
 	static const int CHAR_SIZE = 16;