diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
index 49f7702dec..42428ce9ed 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -121,6 +121,7 @@ public class WidgetID
 	public static final int MINIGAME_TAB_ID = 76;
 	public static final int SPELLBOOK_GROUP_ID = 218;
 	public static final int PVP_GROUP_ID = 90;
+	public static final int FISHING_TRAWLER_GROUP_ID = 366;
 	public static final int ZEAH_MESS_HALL_GROUP_ID = 235;
 	public static final int KOUREND_FAVOUR_GROUP_ID = 246;
 	public static final int LOOTING_BAG_GROUP_ID = 81;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
index f52ebd7260..3217d70a91 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
@@ -91,19 +91,27 @@ public class ClanChatPlugin extends Plugin
 		}
 	}
 
-	@Subscribe
-	public void onClanMemberJoined(final ClanMemberJoined event) {
-		final ClanMember member = event.getMember();
-		if (member.getWorld() == this.client.getWorld()) {
-			final String memberName = Text.toJagexName(member.getUsername());
-			for (final Player player : this.client.getPlayers()) {
-				if (player != null && memberName.equals(Text.toJagexName(player.getName()))) {
-					ClanChatPlugin.clanMembers.add(player);
-					this.addClanCounter();
-					break;
-				}
-			}
-		}
+    @Subscribe
+    public void onClanMemberJoined(ClanMemberJoined event)
+    {
+        final ClanMember member = event.getMember();
+
+        if (member.getWorld() == client.getWorld())
+        {
+            final Player local = client.getLocalPlayer();
+            final String memberName = Text.toJagexName(member.getUsername());
+
+            for (final Player player : client.getPlayers())
+            {
+                if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName())))
+                {
+                    clanMembers.add(player);
+                    addClanCounter();
+                    break;
+                }
+            }
+        }
+
 		if (this.clanJoinedTick == this.client.getTickCount()) {
 			return;
 		}
@@ -292,13 +300,18 @@ public class ClanChatPlugin extends Plugin
 		}
 	}
 
-	@Subscribe
-	public void onPlayerSpawned(final PlayerSpawned event) {
-		if (event.getPlayer().isClanMember()) {
-			ClanChatPlugin.clanMembers.add(event.getPlayer());
-			this.addClanCounter();
-		}
-	}
+    @Subscribe
+    public void onPlayerSpawned(PlayerSpawned event)
+    {
+        final Player local = client.getLocalPlayer();
+        final Player player = event.getPlayer();
+
+        if (player != local && player.isClanMember())
+        {
+            clanMembers.add(player);
+            addClanCounter();
+        }
+    }
 
 	@Subscribe
 	public void onPlayerDespawned(final PlayerDespawned event) {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
index 311e286b0b..1bd6590af2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
@@ -104,4 +104,15 @@ public interface NpcAggroAreaConfig extends Config
 	{
 		return true;
 	}
+
+	@ConfigItem(
+		keyName = "npcUnaggroShowNotWorkingOverlay",
+		name = "Hide overlay hint",
+		description = "Hide overlay hint if plugin is enabled in unsupported area",
+		position = 6
+	)
+	default boolean hideOverlayHint()
+	{
+		return false;
+	}
 }