diff --git a/GroupMethods.h b/GroupMethods.h
index a2aa9c9..a77ff43 100644
--- a/GroupMethods.h
+++ b/GroupMethods.h
@@ -231,7 +231,11 @@ namespace LuaGroup
         if (icon >= TARGETICONCOUNT)
             return luaL_argerror(L, 2, "valid target icon expected");
 
+#if (defined(TBC) || defined(TBC))
+        group->SetTargetIcon(icon, ObjectGuid(target));
+#else
         group->SetTargetIcon(icon, ObjectGuid(setter), ObjectGuid(target));
+#endif
         return 0;
     }
 
diff --git a/PlayerMethods.h b/PlayerMethods.h
index 2df57fb..9a6e7be 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -2073,8 +2073,10 @@ namespace LuaPlayer
         data << uint8(channel);
         data << int32(LANG_ADDON);
         data << uint64(player->GET_GUID());
+#ifndef CLASSIC
         data << uint32(0);
         data << uint64(receiver->GET_GUID());
+#endif
         data << uint32(fullmsg.length() + 1);
         data << fullmsg;
         data << uint8(0);