diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
index 94a26bd81b..251e892647 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp
@@ -160,7 +160,7 @@ void DSound::SetVolume(int volume)
 	m_volume = (int)floor(log10((float)volume) * 5000.0f) - 10000;
 
 	soundCriticalSection.Enter();
-	if (ds != NULL)
+	if (dsBuffer != NULL)
 		dsBuffer->SetVolume(m_volume);
 	soundCriticalSection.Leave();
 }
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.h b/Source/Core/AudioCommon/Src/DSoundStream.h
index 17f91d27d3..e38c045c09 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.h
+++ b/Source/Core/AudioCommon/Src/DSoundStream.h
@@ -68,6 +68,8 @@ public:
 		, totalRenderedBytes(0)
 		, currentPos(0)
 		, lastPos(0)
+		, dsBuffer(0)
+		, ds(0)
 	{}
 
     virtual ~DSound() {}
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
index 5176dff8ef..22a2642ba6 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
@@ -329,7 +329,7 @@ void ConfigDialog::ToBlank(bool ToBlank)
 {
 	if (!ControlsCreated) return;
 
-	for (int j = 0; j < 4; j++)
+	for (int j = 0; j < 1; j++)
 	{
 		if(ToBlank)
 		{