diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
index 98bd849426..4c6161b814 100644
--- a/cmake/BuildParameters.cmake
+++ b/cmake/BuildParameters.cmake
@@ -34,14 +34,10 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
 	message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default")
 endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
 
+# Initially stip was disabled on release build but it is not stackstrace friendly!
+# It only cost several MB so disbable it by default
 if(NOT DEFINED CMAKE_BUILD_STRIP)
-    if(CMAKE_BUILD_TYPE STREQUAL "Release")
-        set(CMAKE_BUILD_STRIP TRUE)
-        message(STATUS "Enable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
-    else(CMAKE_BUILD_TYPE STREQUAL "Release")
-        set(CMAKE_BUILD_STRIP FALSE)
-        message(STATUS "Disable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
-    endif(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(CMAKE_BUILD_STRIP FALSE)
 endif(NOT DEFINED CMAKE_BUILD_STRIP)
 
 if(NOT DEFINED CMAKE_BUILD_PO)
diff --git a/linux_various/glsl2h.pl b/linux_various/glsl2h.pl
index e4aefddbcd..5692d6ceb7 100755
--- a/linux_various/glsl2h.pl
+++ b/linux_various/glsl2h.pl
@@ -23,7 +23,10 @@ eval {
 my @gsdx_res = qw/convert.glsl interlace.glsl merge.glsl shadeboost.glsl tfx.glsl fxaa.fx/;
 my $gsdx_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "GSdx", "res");
 my $gsdx_out = File::Spec->catdir($gsdx_path, "glsl_source.h");
-glsl2h($gsdx_path, $gsdx_out, \@gsdx_res);
+# Keep the old FXAA for now
+print "Warning: the rebuilding of GSdx ogl shader was temporary disabled\n";
+print "It will be reenabled when we got time to test Asmodean new fxaa shader\n";
+#glsl2h($gsdx_path, $gsdx_out, \@gsdx_res);
 
 my @zz_res  = qw/ps2hw_gl4.glsl/;
 my $zz_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "zzogl-pg", "opengl");
diff --git a/plugins/zzogl-pg-cg/opengl/GifTransfer.cpp b/plugins/zzogl-pg-cg/opengl/GifTransfer.cpp
index 7b217d8bd3..04be132299 100644
--- a/plugins/zzogl-pg-cg/opengl/GifTransfer.cpp
+++ b/plugins/zzogl-pg-cg/opengl/GifTransfer.cpp
@@ -97,7 +97,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
 
 				if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
 				{
-					u32 tagprim = path->tag.PRIM;
+					u64 tagprim = path->tag.PRIM;
 					GIFRegHandlerPRIM((u32*)&tagprim);
 				}
 			}
diff --git a/plugins/zzogl-pg/opengl/GifTransfer.cpp b/plugins/zzogl-pg/opengl/GifTransfer.cpp
index 315da2ca85..f56e6de4c2 100644
--- a/plugins/zzogl-pg/opengl/GifTransfer.cpp
+++ b/plugins/zzogl-pg/opengl/GifTransfer.cpp
@@ -97,7 +97,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
 
 				if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
 				{
-					u32 tagprim = path->tag.PRIM;
+					u64 tagprim = path->tag.PRIM;
 					GIFRegHandlerPRIM((u32*)&tagprim);
 				}
 			}