diff --git a/3rdparty/SDL-1.3.0-5387/CMakeLists.txt b/3rdparty/SDL-1.3.0-5387/CMakeLists.txt
index 69ace89c7e..d5399f2c66 100644
--- a/3rdparty/SDL-1.3.0-5387/CMakeLists.txt
+++ b/3rdparty/SDL-1.3.0-5387/CMakeLists.txt
@@ -175,23 +175,23 @@ set(SDL_sources
    "${SDL_ROOT}/src/joystick/SDL_sysjoystick.h"
 
    #c/libm:
-   "${SDL_ROOT}/src/libm/e_atan2.c"
-   "${SDL_ROOT}/src/libm/e_log.c"
-   "${SDL_ROOT}/src/libm/e_pow.c"
-   "${SDL_ROOT}/src/libm/e_rem_pio2.c"
-   "${SDL_ROOT}/src/libm/e_sqrt.c"
-   "${SDL_ROOT}/src/libm/k_cos.c"
-   "${SDL_ROOT}/src/libm/k_rem_pio2.c"
-   "${SDL_ROOT}/src/libm/k_sin.c"
-   "${SDL_ROOT}/src/libm/math.h"
-   "${SDL_ROOT}/src/libm/math_private.h"
-   "${SDL_ROOT}/src/libm/s_atan.c"
-   "${SDL_ROOT}/src/libm/s_copysign.c"
-   "${SDL_ROOT}/src/libm/s_cos.c"
-   "${SDL_ROOT}/src/libm/s_fabs.c"
-   "${SDL_ROOT}/src/libm/s_floor.c"
-   "${SDL_ROOT}/src/libm/s_scalbn.c"
-   "${SDL_ROOT}/src/libm/s_sin.c"
+   #"${SDL_ROOT}/src/libm/e_atan2.c"
+   #"${SDL_ROOT}/src/libm/e_log.c"
+   #"${SDL_ROOT}/src/libm/e_pow.c"
+   #"${SDL_ROOT}/src/libm/e_rem_pio2.c"
+   #"${SDL_ROOT}/src/libm/e_sqrt.c"
+   #"${SDL_ROOT}/src/libm/k_cos.c"
+   #"${SDL_ROOT}/src/libm/k_rem_pio2.c"
+   #"${SDL_ROOT}/src/libm/k_sin.c"
+   #"${SDL_ROOT}/src/libm/math.h"
+   #"${SDL_ROOT}/src/libm/math_private.h"
+   #"${SDL_ROOT}/src/libm/s_atan.c"
+   #"${SDL_ROOT}/src/libm/s_copysign.c"
+   #"${SDL_ROOT}/src/libm/s_cos.c"
+   #"${SDL_ROOT}/src/libm/s_fabs.c"
+   #"${SDL_ROOT}/src/libm/s_floor.c"
+   #"${SDL_ROOT}/src/libm/s_scalbn.c"
+   #"${SDL_ROOT}/src/libm/s_sin.c"
 
    #c/power:
    "${SDL_ROOT}/src/power/SDL_power.c"
diff --git a/common/src/Utilities/Linux/LnxThreads.cpp b/common/src/Utilities/Linux/LnxThreads.cpp
index 89744b407e..edef01dbc2 100644
--- a/common/src/Utilities/Linux/LnxThreads.cpp
+++ b/common/src/Utilities/Linux/LnxThreads.cpp
@@ -16,6 +16,7 @@
 
 #include "../PrecompiledHeader.h"
 #include "PersistentThread.h"
+#include <sys/prctl.h>
 
 // We wont need this until we actually have this more then just stubbed out, so I'm commenting this out
 // to remove an unneeded dependency.
@@ -92,7 +93,9 @@ void Threading::pxThread::_platform_specific_OnCleanupInThread()
 
 void Threading::pxThread::_DoSetThreadName( const char* name )
 {
-	// dunno if linux has a feature for naming threads ...?
+	// Extract of manpage: "The name can be up to 16 bytes long, and should be
+	//						null-terminated if it contains fewer bytes."
+	prctl(PR_SET_NAME, name, 0, 0, 0);
 }
 
 #endif
diff --git a/plugins/onepad/Linux/dialog.cpp b/plugins/onepad/Linux/dialog.cpp
index f5e8d672e0..fde63c10e3 100644
--- a/plugins/onepad/Linux/dialog.cpp
+++ b/plugins/onepad/Linux/dialog.cpp
@@ -489,7 +489,8 @@ button_positions b_pos[MAX_KEYS] =
 };
 
 // Warning position is important and must match the order of the PadOptions structure
-button_positions check_pos[8] =
+#define CHECK_NBR 8
+button_positions check_pos[CHECK_NBR] =
 {
 	{ "Enable force feedback", 40, 400},
 	{ "Reverse Lx", 40, 304},
@@ -501,7 +502,7 @@ button_positions check_pos[8] =
 	{ "Hack: Sixaxis/DS3 plugged in USB", 368, 400}
 };
 
-GtkWidget *create_notebook_page_dialog(int page, dialog_buttons btn[MAX_KEYS], dialog_checkbox checkbox[7])
+GtkWidget *create_notebook_page_dialog(int page, dialog_buttons btn[MAX_KEYS], dialog_checkbox checkbox[CHECK_NBR])
 {
     GtkWidget *main_box;
     GtkWidget *joy_choose_frame, *joy_choose_box;
@@ -567,7 +568,7 @@ GtkWidget *create_notebook_page_dialog(int page, dialog_buttons btn[MAX_KEYS], d
 	}
     
 	u32 mask = 1 << (16*page);
-	for(int i = 0; i < 8; i++) {
+	for(int i = 0; i < CHECK_NBR; i++) {
 		checkbox[i].create(keys_static_area, check_pos[i].label, check_pos[i].x, check_pos[i].y, mask);
 		mask = mask << 1;
 	}
@@ -608,7 +609,7 @@ void DisplayDialog()
 	GtkWidget *page_label[2];
 
 	dialog_buttons btn[2][MAX_KEYS];
-	dialog_checkbox checkbox[2][7];
+	dialog_checkbox checkbox[2][CHECK_NBR];
 
 	LoadConfig();
 	key_tree_manager = new keys_tree;