diff --git a/src/main/scala/net/psforever/actors/session/csr/SquadHandlerLogic.scala b/src/main/scala/net/psforever/actors/session/csr/SquadHandlerLogic.scala
index 70e789621..9c2a07b20 100644
--- a/src/main/scala/net/psforever/actors/session/csr/SquadHandlerLogic.scala
+++ b/src/main/scala/net/psforever/actors/session/csr/SquadHandlerLogic.scala
@@ -28,21 +28,21 @@ class SquadHandlerLogic(val ops: SessionSquadHandlers, implicit val context: Act
   /* packet */
 
   def handleSquadDefinitionAction(pkt: SquadDefinitionActionMessage): Unit = {
-    /*if (!player.spectator) {
+    if (!player.spectator) {
      val SquadDefinitionActionMessage(u1, u2, action) = pkt
      squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Definition(u1, u2, action))
-    }*/
+    }
   }
 
   def handleSquadMemberRequest(pkt: SquadMembershipRequest): Unit = {
-  /*  if (!player.spectator) {
+    if (!player.spectator) {
       val SquadMembershipRequest(request_type, char_id, unk3, player_name, unk5) = pkt
       squadService ! SquadServiceMessage(
         player,
         continent,
         SquadServiceAction.Membership(request_type, char_id, unk3, player_name, unk5)
       )
-    }*/
+    }
   }
 
   def handleSquadWaypointRequest(pkt: SquadWaypointRequest): Unit = {
diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
index 523ed3330..f9dd3a062 100644
--- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
+++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
@@ -3853,7 +3853,6 @@ class ZoningOperations(
     }
 
     def startEnqueueSquadMessages: Boolean = {
-      println(s"${sessionLogic.zoning.zoneReload} ${sessionLogic.zoning.spawn.setAvatar} ${player.isAlive}")
       !sessionLogic.zoning.zoneReload && sessionLogic.zoning.spawn.setAvatar && player.isAlive
     }
 
diff --git a/src/main/scala/net/psforever/services/teamwork/invitations/IndirectInvite.scala b/src/main/scala/net/psforever/services/teamwork/invitations/IndirectInvite.scala
index cb90cb786..7d73ba7fe 100644
--- a/src/main/scala/net/psforever/services/teamwork/invitations/IndirectInvite.scala
+++ b/src/main/scala/net/psforever/services/teamwork/invitations/IndirectInvite.scala
@@ -40,10 +40,10 @@ final case class IndirectInvite(originalRequester: Player, features: SquadFeatur
       val leaderCharId = player.CharId
       val invitedPlayer = originalRequester.CharId
       manager
-        .handleVacancyInvite(features, invitedPlayer, invitedPlayer, originalRequester)
+        .handleVacancyInvite(features, invitedPlayer, leaderCharId, originalRequester)
         .collect {
           case (_, position) if manager.joinSquad(originalRequester, features, position) =>
-            manager.acceptanceMessages(invitedPlayer, invitedPlayer, originalRequester.Name)
+            manager.acceptanceMessages(leaderCharId, invitedPlayer, originalRequester.Name)
             //clean up invitations specifically for this squad and this position
             val cleanedUpActiveInvitesForSquadAndPosition = manager.cleanUpActiveInvitesForSquadAndPosition(features.Squad.GUID, position)
             cleanedUpActiveInvitesForSquadAndPosition.collect { case (id, _) =>
@@ -79,7 +79,7 @@ final case class IndirectInvite(originalRequester: Player, features: SquadFeatur
         .orElse {
           manager.publish(
             leaderCharId,
-            SquadResponse.SquadRelatedComment(s"Your invitation to ${player.Name} was accepted, but failed.")
+            SquadResponse.SquadRelatedComment(s"Your invitation to ${originalRequester.Name} was accepted, but failed.")
           )
           manager.publish(
             invitedPlayer,
diff --git a/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToCreateASquad.scala b/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToCreateASquad.scala
index efbdd9088..5f50bdd96 100644
--- a/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToCreateASquad.scala
+++ b/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToCreateASquad.scala
@@ -114,7 +114,7 @@ final case class InvitationToCreateASquad(futureSquadLeader: Player)
       SquadResponse.Membership(SquadResponseType.Reject, invitingPlayerCharId, Some(rejectingPlayer), player.Name, unk5 = false)
     )
     manager.publish(
-      rejectingPlayer,
+      invitingPlayerCharId,
       SquadResponse.SquadRelatedComment(s"Your request to form a squad has been refused.")
     )
   }
diff --git a/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToJoinSquad.scala b/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToJoinSquad.scala
index 8f43482dd..708238729 100644
--- a/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToJoinSquad.scala
+++ b/src/main/scala/net/psforever/services/teamwork/invitations/InvitationToJoinSquad.scala
@@ -109,10 +109,10 @@ final case class InvitationToJoinSquad(charId: Long, name: String, features: Squ
     //rejectingPlayer is the would-be squad member; the squad leader sent the request and was rejected
     doRejection(manager, player, rejectingPlayer)
     manager.rejectionMessages(rejectingPlayer, charId, player.Name)
-    manager.publish(
+    /*manager.publish(
       rejectingPlayer,
       SquadResponse.SquadRelatedComment(s"Your request to join squad '${features.Squad.Task}' has been refused.")
-    )
+    )*/
   }
 
   def doRejection(