diff --git a/plugins/onepad/KeyStatus.cpp b/plugins/onepad/KeyStatus.cpp
index 246272d694..183d3457af 100644
--- a/plugins/onepad/KeyStatus.cpp
+++ b/plugins/onepad/KeyStatus.cpp
@@ -27,6 +27,7 @@ void KeyStatus::Init()
 		m_button[pad] = 0xFFFF;
 		m_internal_button_kbd[pad] = 0xFFFF;
 		m_internal_button_joy[pad] = 0xFFFF;
+		m_state_acces[pad] = false;
 
 		for (int index = 0; index < MAX_KEYS; index++) {
 			m_button_pressure[pad][index] = 0xFF;
diff --git a/plugins/onepad/Linux/dialog.cpp b/plugins/onepad/Linux/dialog.cpp
index 46629ce4e9..b3852b345c 100644
--- a/plugins/onepad/Linux/dialog.cpp
+++ b/plugins/onepad/Linux/dialog.cpp
@@ -624,7 +624,7 @@ void Dialog::config_key(int pad, int key)
                     m_map_images[pad][key_pressed] = key;
     				captured = true;
     			}
-    			itjoy++;
+    			++itjoy;
     		}
         }
 	}
diff --git a/plugins/onepad/Linux/linux.cpp b/plugins/onepad/Linux/linux.cpp
index fa30c2f1e1..a8fd8e2e9b 100644
--- a/plugins/onepad/Linux/linux.cpp
+++ b/plugins/onepad/Linux/linux.cpp
@@ -81,7 +81,7 @@ void _PADclose()
 	while (it != s_vgamePad.end())
 	{
 		delete *it;
-		it ++;
+		++it;
 	}
 
 	s_vgamePad.clear();
diff --git a/plugins/onepad/SDL/joystick.cpp b/plugins/onepad/SDL/joystick.cpp
index d8be8679a7..03bf0fc5ae 100644
--- a/plugins/onepad/SDL/joystick.cpp
+++ b/plugins/onepad/SDL/joystick.cpp
@@ -38,7 +38,7 @@ void JoystickInfo::UpdateReleaseState()
 	while (itjoy != s_vgamePad.end())
 	{
 		(*itjoy)->SaveState();
-		itjoy++;
+		++itjoy;
 	}
 }
 
@@ -70,7 +70,7 @@ void JoystickInfo::EnumerateJoysticks(vector<GamePad*>& vjoysticks)
 	while (it != vjoysticks.end())
 	{
 		delete *it;
-		it ++;
+		++it;
 	}
 
 	vjoysticks.resize(SDL_NumJoysticks());
diff --git a/plugins/onepad/state_management.cpp b/plugins/onepad/state_management.cpp
index e2eb19c638..bb5550e210 100644
--- a/plugins/onepad/state_management.cpp
+++ b/plugins/onepad/state_management.cpp
@@ -183,7 +183,6 @@ u8 pad_poll(u8 value)
 		return query.response[++query.lastByte];
 	}
 
-	int i;
 	Pad *pad = &pads[query.port][query.slot];
 
 	if (query.lastByte == 0) {
@@ -202,6 +201,7 @@ u8 pad_poll(u8 value)
 			{
 				query.response[2] = 0x5A;
 #if 0
+				int i;
 				Update(query.port, query.slot);
 				ButtonSum *sum = &pad->sum;