diff --git a/client.cs b/client.cs
index f284c1f..d6f8290 100644
--- a/client.cs
+++ b/client.cs
@@ -67,22 +67,22 @@ function RPGClient_SendClick(%button, %pos)
 	commandToServer('RPG_Click', %button, getWord(%norm, 0), getWord(%norm, 1), RPGClient_Aspect());
 }
 
-function RPGClient_Mouse::onMouseDown(%this, %modifier, %mouseClick, %mousePos, %button)
+function RPGClient_Mouse::onMouseDown(%this, %mod, %pos, %clicks)
 {
 	if (!$RPGClient::Active)
 	{
 		return;
 	}
-	RPGClient_SendClick(%button, %mousePos);
+	RPGClient_SendClick(0, %pos);
 }
 
-function RPGClient_Mouse::onRightMouseDown(%this, %modifier, %mouseClick, %mousePos, %button)
+function RPGClient_Mouse::onRightMouseDown(%this, %mod, %pos, %clicks)
 {
 	if (!$RPGClient::Active)
 	{
 		return;
 	}
-	RPGClient_SendClick(1, %mousePos);
+	RPGClient_SendClick(1, %pos);
 }
 
 function RPGClient_EnableOverlay()
@@ -91,8 +91,9 @@ function RPGClient_EnableOverlay()
 	{
 		return;
 	}
-	RPGClient_Mouse = new GuiMouseEventCtrl(RPGClient_Mouse)
+	%mouse = new GuiMouseEventCtrl(RPGClient_Mouse)
 	{
+		className = "RPGClient_Mouse";
 		horizSizing = "width";
 		vertSizing = "height";
 		position = "0 0";