Attempt fixes for some parses not being added.

diff --git a/src/main.lua b/src/main.lua
index 26790e3..6900213 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -101,9 +101,12 @@ end
 -- Tests if a player with name playerName is in the same
 -- guild as the player running this addon.
 function addon:IsInMyGuild(playerName)
-	if self.guildName then
+	if UnitIsUnit(playerName, "player") then
+		-- We are always in our own guild
+		return true
+	elseif self.guildName then
 		local guildName, _, _ = GetGuildInfo(playerName)
-		return guildName == self.guildName
+		return (guildName == self.guildName);
 	else
 		return false
 	end
diff --git a/src/parse_modules/parse_modules_core.lua b/src/parse_modules/parse_modules_core.lua
index 3753eb7..190126f 100644
--- a/src/parse_modules/parse_modules_core.lua
+++ b/src/parse_modules/parse_modules_core.lua
@@ -68,8 +68,12 @@ end

 local function setAdditionalDataForPlayers(players)
 	for _, player in ipairs(players) do
-		player.role = UnitGroupRolesAssigned(player.name);
-		_, player.class = UnitClass(player.name);
+		if not player.role then
+			player.role = UnitGroupRolesAssigned(player.name);
+		end
+		if not player.class then
+			_, player.class = UnitClass(player.name);
+		end
 	end
 end

diff --git a/src/parse_modules/skada.lua b/src/parse_modules/skada.lua
index a60e56b..3c22f1d 100644
--- a/src/parse_modules/skada.lua
+++ b/src/parse_modules/skada.lua
@@ -25,7 +25,9 @@ function mod:GetPlayersFromSet(skadaSet)
 				id = player.id,
 				name = player.name,
 				damage = player.damage,
-				healing = player.healing
+				healing = player.healing,
+				role = player.role,
+				class = player.class
 			};
 			tinsert(players, playerData);
 		end