EMA Version: v8.3.0-Release-v2.4(0138)

diff --git a/Core/Team-Classic.lua b/Core/Team-Classic.lua
index 0cf6fc3..79cd99f 100644
--- a/Core/Team-Classic.lua
+++ b/Core/Team-Classic.lua
@@ -1517,9 +1517,9 @@ function EMA:PARTY_LEADER_CHANGED( event, ... )
 						if IsCharacterInTeam( character ) == false then
 							if EMA.db.lootToGroupFriendsAreNotStrangers == true then
 								local isAFriend = false
-								for friendIndex = 1, GetNumFriends() do
-									local friendName = GetFriendInfo( friendIndex )
-									if partyMemberName == friendName then
+								for friendIndex = 1, C_FriendList.GetNumOnlineFriends() do
+								local f = C_FriendList.GetFriendInfoByIndex( friendIndex )
+									if inviter == f.name then
 										isAFriend = true
 									end
 								end
diff --git a/Modules/Trade-Classic.lua b/Modules/Trade-Classic.lua
index ed191b5..aaab8d6 100644
--- a/Modules/Trade-Classic.lua
+++ b/Modules/Trade-Classic.lua
@@ -796,7 +796,7 @@ function EMA:TradeAllItems()
 					local _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink )
 					local canTrade = false
 					if EMA.db.tradeGrayItems == true then
-						if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoBoEItemTag ) == true then
+						if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoGrayItemsTag ) == true then
 							if itemRarity == 0 then
 								canTrade = true
 							end