diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9fd4f5f48..ae57e9c949 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,11 @@ include(SelectPcsx2Plugins)
 # add additional project-wide include directories
 include_directories(${PROJECT_SOURCE_DIR}/common/include
 					${PROJECT_SOURCE_DIR}/common/include/Utilities
-					${PROJECT_SOURCE_DIR}/common/include/x86emitter)
+					${PROJECT_SOURCE_DIR}/common/include/x86emitter
+                    # WORKAROUND Some issue with multiarch on Debian/Ubuntu
+                    /usr/include/i386-linux-gnu
+                    /usr/include/x86_64-linux-gnu
+                    )
 
 # make the translation
 if(EXISTS "${PROJECT_SOURCE_DIR}/locales")
diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp
index 938f999782..88d9b00b97 100644
--- a/pcsx2/gui/i18n.cpp
+++ b/pcsx2/gui/i18n.cpp
@@ -169,6 +169,11 @@ static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId )
 		case wxLANGUAGE_CHINESE_SINGAPORE    : return wxLANGUAGE_CHINESE_SIMPLIFIED;
 
 		case wxLANGUAGE_SAMI                 : 
+		// The correct fallback for Sami would be
+		// however, currently wxWidgets (2.9.3) only supports wxLANGUAGE_SAMI.
+		//  case: wxLANGUAGE_SAMI_LULE_SWEDEN :
+		//  case: wxLANGUAGE_SAMI_NORTHERN_SWEDEN :
+		//  case: wxLANGUAGE_SAMI_SOUTHERN_SWEDEN :
 		case wxLANGUAGE_SWEDISH_FINLAND      : return wxLANGUAGE_SWEDISH;
 
 		case wxLANGUAGE_PORTUGUESE           : return wxLANGUAGE_PORTUGUESE_BRAZILIAN;
@@ -178,8 +183,30 @@ static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId )
 		case wxLANGUAGE_GERMAN_BELGIUM       : 
 		case wxLANGUAGE_GERMAN_LIECHTENSTEIN : 
 		case wxLANGUAGE_GERMAN_LUXEMBOURG    : 
+		// Currently wxWidgets (2.9.3) doesn't support Sorbian.
+		//  case wxLANGUAGE_LOWER_SORBIAN :
+		//  case wxLANGUAGE_UPPER_SORBIAN :
 		case wxLANGUAGE_GERMAN_SWISS         : return wxLANGUAGE_GERMAN;
 
+		case wxLANGUAGE_SPANISH_ARGENTINA:
+		case wxLANGUAGE_SPANISH_BOLIVIA:
+		case wxLANGUAGE_SPANISH_CHILE:
+		case wxLANGUAGE_SPANISH_COLOMBIA:
+		case wxLANGUAGE_SPANISH_COSTA_RICA:
+		case wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
+		case wxLANGUAGE_SPANISH_ECUADOR:
+		case wxLANGUAGE_SPANISH_EL_SALVADOR:
+		case wxLANGUAGE_SPANISH_GUATEMALA:
+		case wxLANGUAGE_SPANISH_HONDURAS:
+		case wxLANGUAGE_SPANISH_MEXICAN:
+		case wxLANGUAGE_SPANISH_NICARAGUA:
+		case wxLANGUAGE_SPANISH_PANAMA:
+		case wxLANGUAGE_SPANISH_PARAGUAY:
+		case wxLANGUAGE_SPANISH_PERU:
+		case wxLANGUAGE_SPANISH_PUERTO_RICO:
+		case wxLANGUAGE_SPANISH_URUGUAY:
+		case wxLANGUAGE_SPANISH_VENEZUELA: return wxLANGUAGE_SPANISH_MODERN;
+
 		case wxLANGUAGE_ITALIAN_SWISS        : return wxLANGUAGE_ITALIAN;
 		
 		default                              : break;
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 6cc36d59af..91dfee01e0 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -96,10 +96,6 @@ set(GSdxSources
     GSUtil.cpp
     GSVector.cpp
     GSVertexTrace.cpp
-    GSVertexTrace.x64.avx.cpp
-    GSVertexTrace.x86.cpp
-    GSVertexTrace.x86.avx.cpp
-    GSVertexTrace.x64.cpp
     GSWnd.cpp
     GSdx.cpp
     stdafx.cpp
diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp
index 9244bd162b..ae5b16fea3 100644
--- a/plugins/GSdx/GSState.cpp
+++ b/plugins/GSdx/GSState.cpp
@@ -746,7 +746,7 @@ template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0)
 				blocks >>= 1;
 			}
 		
-			for(int i = 0; i < blocks; i++, BITBLTBUF.SBP++)
+			for(int j = 0; j < blocks; j++, BITBLTBUF.SBP++)
 			{
 				InvalidateLocalMem(BITBLTBUF, r, true);
 			}