diff --git a/SConstruct b/SConstruct
index d169a47983..d7e6fd37f8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,7 +47,7 @@ include_paths = [
     basedir + 'Externals/WiiUseSrc/Src',
     basedir + 'Source/Core/VideoCommon/Src',
     basedir + 'Source/Core/InputCommon/Src',
-    basedir + 'Source/Plugins/InputUICommon/Src',
+    basedir + 'Source/Core/InputUICommon/Src',
     basedir + 'Source/Core/AudioCommon/Src',
     basedir + 'Source/Core/DebuggerUICommon/Src',
     basedir + 'Source/Core/DSPCore/Src',
@@ -66,7 +66,7 @@ dirs = [
     'Source/Core/DebuggerUICommon/Src',
     'Source/Core/DSPCore/Src',
     'Source/DSPTool/Src',
-    'Source/Plugins/InputUICommon/Src/',
+    'Source/Core/InputUICommon/Src/',
     'Source/Plugins/Plugin_VideoOGL/Src',
     'Source/Plugins/Plugin_VideoSoftware/Src',
     'Source/Plugins/Plugin_DSP_HLE/Src',
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index ddc76c5e81..f8d52c3af6 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -12,7 +12,7 @@ files = [
 
 libs = [
 	'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', 
-	'inputcommon', 'common', 'lua', 'z', 'sfml-network'
+	'inputcommon', 'inputuicommon', 'common', 'lua', 'z', 'sfml-network'
 	]
 
 if wxenv['HAVE_WX']:
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
index 5ff85adf32..a2396ae9ea 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
@@ -102,7 +102,7 @@ Keyboard::Key::Key(Display* const display, KeyCode keycode)
 	
 	// Convert to upper case for the keyname
 	if (keysym >= 97 && keysym <= 122)
-		keysym = keysym - 32;
+		keysym -= 32;
 
 	// 0x0110ffff is the top of the unicode character range according to keysymdef.h
 	// although it is probably more than we need.
diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript
index a0c6ec8013..4147d7070c 100644
--- a/Source/Core/InputUICommon/Src/SConscript
+++ b/Source/Core/InputUICommon/Src/SConscript
@@ -12,4 +12,4 @@ files = [
 	'WXInputBase.cpp',
 	]
 
-env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files)
+env.StaticLibrary(env['local_libs'] + 'inputuicommon', files)
diff --git a/Source/Plugins/Plugin_GCPadNew/Src/SConscript b/Source/Plugins/Plugin_GCPadNew/Src/SConscript
index 2ac972fc79..8a532b8784 100644
--- a/Source/Plugins/Plugin_GCPadNew/Src/SConscript
+++ b/Source/Plugins/Plugin_GCPadNew/Src/SConscript
@@ -12,7 +12,7 @@ files = [
 	]
 
 padenv.Append(
-	LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
+	LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
 	)
 
 padenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
index c8c476a91c..97226b4441 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
@@ -20,7 +20,7 @@ files = [
 	]
 
 wiinewenv.Append(
-	LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
+	LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
 	)
 
 wiinewenv.SharedLibrary(env['plugin_dir']+name, files)