diff --git a/plugins/GSnull/Windows/GS.def b/plugins/GSnull/Windows/GS.def
index f498fe8e25..c21351b95b 100644
--- a/plugins/GSnull/Windows/GS.def
+++ b/plugins/GSnull/Windows/GS.def
@@ -1,6 +1,6 @@
 ; FireWire.def : Declares the module parameters for the DLL.
 
-LIBRARY      "FWnull"
+;LIBRARY      "GSnull"
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/SSSPSXPAD/PadSSSPSX.cpp b/plugins/SSSPSXPAD/PadSSSPSX.cpp
index 4cbcf3aa6e..db9d38e834 100644
--- a/plugins/SSSPSXPAD/PadSSSPSX.cpp
+++ b/plugins/SSSPSXPAD/PadSSSPSX.cpp
@@ -25,6 +25,7 @@ HWND hTargetWnd;
 static std::string s_strIniPath( "inis/" );
 
 static CRITICAL_SECTION update_lock;
+static CRITICAL_SECTION init_lock;
 
 struct EnterScopedSection
 {
@@ -40,7 +41,6 @@ struct EnterScopedSection
 };
 
 
-
 static struct
 {
 	keyEvent ev;
@@ -139,6 +139,8 @@ static bool ReleaseDirectInput (void)
 
 static bool InitDirectInput (void)
 {
+	EnterScopedSection initlock( init_lock );
+	
 	if (global.pDInput)
 		return TRUE;
 	HRESULT result = DirectInput8Create (hInstance, DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&global.pDInput, NULL);
@@ -760,12 +762,14 @@ u32 CALLBACK PSEgetLibVersion (void)
 s32 CALLBACK PADinit (u32 flags)
 {
 	InitializeCriticalSection( &update_lock );
+	InitializeCriticalSection( &init_lock );
 	return 0;
 }
 
 void CALLBACK PADshutdown (void)
 {
 	DeleteCriticalSection( &update_lock );
+	DeleteCriticalSection( &init_lock );
 }
 
 static int n_open = 0;