diff --git a/cmake/FindSoundTouch.cmake b/cmake/FindSoundTouch.cmake
index f8234aa45a..4501e896d6 100644
--- a/cmake/FindSoundTouch.cmake
+++ b/cmake/FindSoundTouch.cmake
@@ -10,7 +10,7 @@ if(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
 endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
 
 # include dir
-find_path(SOUNDTOUCH_INCLUDE_DIR soundtouch/SoundTouch.h)
+find_path(SOUNDTOUCH_INCLUDE_DIR SoundTouch.h)
 
 # finally the library itself
 find_library(libSoundTouch NAMES SoundTouch)
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 9d17cf2e7e..966cfbc726 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -64,9 +64,7 @@ if(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH)
 	set(SOUNDTOUCH_FOUND TRUE)
     # Set path
 	set(SOUNDTOUCH_LIBRARIES SoundTouch)
-    # XXX Need to be updated when repository will be updated
-    # For the moment include are done with the last fallback in bottom of the file
-    # include_directories(${PROJECT_SOURCE_DIR}/3rdparty/soundtouch_internal)
+    include_directories(${PROJECT_SOURCE_DIR}/3rdparty/SoundTouch)
 endif(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH)
 
 if(NOT A52_FOUND OR FORCE_INTERNAL_A52)
@@ -170,4 +168,5 @@ endif(ZLIB_FOUND AND NOT projectZLIB)
 #----------------------------------------
 #		    In all others situation fallback to the 3rdparty
 #----------------------------------------
+# XXX Must be delete when all include will be fixed
 include_directories(${PROJECT_SOURCE_DIR}/3rdparty)
diff --git a/pcsx2/gui/Panels/GameFixesPanel.cpp b/pcsx2/gui/Panels/GameFixesPanel.cpp
index dc5c76f34f..78de290855 100644
--- a/pcsx2/gui/Panels/GameFixesPanel.cpp
+++ b/pcsx2/gui/Panels/GameFixesPanel.cpp
@@ -83,20 +83,19 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow* parent )
 	}
 
 	m_check_Enable = new pxCheckBox( this, _("Enable game fixes"),
-		_("(Warning!  Game fixes can cause compatibility or performance issues!)"));
-	m_check_Enable->SetToolTip(_("The safest way to make sure that all game fixes are completely disabled."));
-	m_check_Enable->SetValue( g_Conf->EnableGameFixes );
-
-	*this	+= Heading(_("Some games need special settings.\nEnable them here.")).Bold()	| StdExpand();
-	*this	+= groupSizer		| pxCenter;
-
-	*this	+= m_check_Enable	| StdExpand();
-	*this	+= Heading(
 		pxE( ".Panel:Gamefixes:Compat Warning",
-			L"Enabling game fixes can cause compatibility or performance issues in other games.  You "
+			L"Gamefixes can fix wrong emulation in some games. However "
+            L"it can cause compatibility or performance issues in other games.  You "
 			L"will need to turn off fixes manually when changing games."
 		)
-	) | StdExpand();
+	);
+
+	m_check_Enable->SetToolTip(_("The safest way to make sure that all game fixes are completely disabled.")).SetSubPadding( 1 );
+	m_check_Enable->SetValue( g_Conf->EnableGameFixes );
+
+	*this	+= m_check_Enable	| StdExpand();
+	*this	+= groupSizer		| pxCenter;
+
 
 	Connect( m_check_Enable->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( GameFixesPanel::OnEnable_Toggled ) );
 
diff --git a/plugins/spu2-x/src/Mixer.cpp b/plugins/spu2-x/src/Mixer.cpp
index c6a752ce3b..44f0a49af9 100644
--- a/plugins/spu2-x/src/Mixer.cpp
+++ b/plugins/spu2-x/src/Mixer.cpp
@@ -57,7 +57,13 @@ __forceinline s32 clamp_mix( s32 x, u8 bitshift )
 }
 
 #if _MSC_VER
-__forceinline		// gcc forceinline fails here... ?
+__forceinline
+// Without the keyword static, gcc compilation fails on the inlining...
+// Unfortunately the function is also used in Reverb.cpp. In order to keep the code 
+// clean we just disable it.
+// We will need link-time code generation / Whole Program optimization to do a clean
+// inline. Gcc 4.5 has the experimental options -flto, -fwhopr and -fwhole-program to
+// do it but it still experimental...
 #endif
 StereoOut32 clamp_mix( const StereoOut32& sample, u8 bitshift )
 {