diff --git a/SConstruct b/SConstruct
index d2538b7108..2ca4d5a804 100644
--- a/SConstruct
+++ b/SConstruct
@@ -312,7 +312,7 @@ else:
         env['binary_dir'] = env['prefix'] + '/bin'
         env['data_dir'] = env['prefix'] + "/share/dolphin-emu"
         env['plugin_dir'] = env['prefix'] + '/lib/dolphin-emu'
-        conf.Define('DATA_DIR', "\"" + env['data_dir'] + "\"")
+        conf.Define('DATA_DIR', "\"" + env['data_dir'] + "/\"")
         conf.Define('LIBS_DIR', "\"" + env['prefix'] + '/lib/' + "\"")
         # Setup destdir for package building
         # Warning: The program will not run from this location.
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp
index 53f857d4df..13562419ea 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp
@@ -50,8 +50,8 @@ void StopWiimoteThreads();
 Wiimote *g_wiimotes[MAX_WIIMOTES];
 
 Wiimote::Wiimote(wiimote_t* const _wiimote, const unsigned int _index)
-	: wiimote(_wiimote)
-	, index(_index)
+	: index(_index)
+	, wiimote(_wiimote)
 	, m_last_data_report(NULL)
 	, m_channel(0)
 {