diff --git a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
index fd26b8d9c2..813969ac72 100644
--- a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
+++ b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
@@ -59,7 +59,7 @@ public class Flexo extends Robot
 	public static final int fixedWidth = Constants.GAME_FIXED_WIDTH;
 	public static final int fixedHeight = Constants.GAME_FIXED_HEIGHT;
 	public static boolean isStretched;
-	public static final int minDelay = 45;
+	public static int minDelay = 45;
 	public static MouseMotionFactory currentMouseMotionFactory;
 	public boolean pausedIndefinitely = false;
 	private Robot peer;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
index 138e187991..41b1c520d9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
@@ -122,10 +122,9 @@ public class LearnToClickPlugin extends Plugin
 		MenuEntry[] menuEntries = client.getMenuEntries();
 		for (MenuEntry entry : menuEntries)
 		{
-			if ((entry.getOption().equals("Floating") && this.shouldRightClickMap) ||
-				(entry.getOption().equals("Hide") && this.shouldRightClickXp) || (entry.getOption().equals("Show")
-				&& this.shouldRightClickXp) || (entry.getOption().equals("Auto retaliate")
-				&& this.shouldRightClickRetaliate))
+			if ((entry.getOption().equals("Floating <col=ff9040>World Map</col>") && this.shouldRightClickMap) ||
+				(entry.getTarget().equals("<col=ff9040>XP drops</col>") && this.shouldRightClickXp) ||
+				(entry.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
 			{
 				event.setForceRightClick(true);
 				return;
@@ -136,8 +135,8 @@ public class LearnToClickPlugin extends Plugin
 	@Subscribe
 	private void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide")
-			&& this.shouldRightClickXp) || (event.getOption().equals("Show") && this.shouldRightClickXp) ||
+		if ((event.getOption().equals("Floating <col=ff9040>World Map</col>") && this.shouldRightClickMap) ||
+			(event.getTarget().equals("<col=ff9040>XP drops</col>") && this.shouldRightClickXp) ||
 			(event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
 		{
 			forceRightClickFlag = true;