diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index 72a860bc78..de178ca279 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -851,8 +851,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 	// TODO: finish this
 
 	// Buttons
+#ifdef __linux__
+	set_control(m_buttons, 0, "Click 1");		// A
+	set_control(m_buttons, 1, "Click 3");		// B
+#else
 	set_control(m_buttons, 0, "Click 0");		// A
 	set_control(m_buttons, 1, "Click 1");		// B
+#endif
 	//set_control(m_buttons, 2, "");		// 1
 	//set_control(m_buttons, 3, "");		// 2
 	//set_control(m_buttons, 4, "");		// -
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9854f560a5..b30888f9df 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -58,7 +58,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode)
 	for (int i = 0; i < 8; i += 2)
 		((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4);
 
-	u32 enableZTexture = (bpmem.ztex2.op != (ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth)? 1 : 0;
+	u32 enableZTexture = ((bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth)? 1 : 0;
 
 	uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel |
 				   ((u32)bpmem.fog.c_proj_fsel.proj << 3) |
@@ -466,7 +466,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
 		}
 	}
-	DepthTextureEnable = bpmem.ztex2.op != (ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth ;
+	DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth ;
 	// Declare samplers
 
 	if(ApiType != API_D3D11)
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
index e7f3cab500..8f7cd53a60 100644
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
@@ -22,9 +22,12 @@ set(SRCS	Src/BPMemLoader.cpp
 			Src/VertexFormatConverter.cpp
 			Src/VertexLoader.cpp
 			Src/VideoConfig.cpp
-			Src/VideoConfigDialog.cpp
 			Src/XFMemLoader.cpp)
 
+if(wxWidgets_FOUND)
+	set(SRCS ${SRCS} Src/VideoConfigDialog.cpp)
+endif(wxWidgets_FOUND)
+
 set(LIBS	videocommon
 			GLEW
 			SOIL