diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..70cfddff
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sfo binary
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
index 21975c9c..e0354c42 100644
--- a/Minecraft.Client/Common/UI/UIScene_Intro.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
@@ -12,27 +12,27 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
 
 	bool bSkipESRB = false;
 	bool bChina = false;
-#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-	bSkipESRB = app.GetProductSKU() != e_sku_SCEA;
-#elif defined _XBOX || _DURANGO || _WINDOWS64
+#if (defined __PS3__ || __ORBIS__ || __PSVITA__)
+	bSkipESRB = app.IsAmericanSKU();
+#else
 	bSkipESRB = !ProfileManager.LocaleIsUSorCanada();
 #endif
 
-#if defined _DURANGO || _WINDOWS64
+#if (defined _DURANGO || _WINDOWS64)
 	bChina = ProfileManager.LocaleIsChina();
 #endif
 	// 4J Stu - These map to values in the Actionscript
 #ifdef _WINDOWS64
 	int platformIdx = 0;
-#elif defined(_XBOX)
+#elif _XBOX
 	int platformIdx = 1;
-#elif defined(_DURANGO)
+#elif _DURANGO
 	int platformIdx = 2;
-#elif defined(__PS3__)
+#elif __PS3__
 	int platformIdx = 3;
-#elif defined(__ORBIS__)
+#elif __ORBIS__
 	int platformIdx = 4;
-#elif defined(__PSVITA__)
+#elif __PSVITA__
 	int platformIdx = 5;
 #endif
 
diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index bce056be..07203b9f 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -466,7 +466,7 @@ ResourceLocation *Textures::getTextureLocation(int iconType)
 	case Icon::TYPE_TERRAIN:
 		return &TextureAtlas::LOCATION_BLOCKS;
 		break;
-	case Icon::TYPE_ITEM:
+	default: //case Icon::TYPE_ITEM
 		return &TextureAtlas::LOCATION_ITEMS;
 		break;
 	}