diff --git a/src/main/scala/net/psforever/actors/session/csr/MountHandlerLogic.scala b/src/main/scala/net/psforever/actors/session/csr/MountHandlerLogic.scala
index 1846f069..4e9480d5 100644
--- a/src/main/scala/net/psforever/actors/session/csr/MountHandlerLogic.scala
+++ b/src/main/scala/net/psforever/actors/session/csr/MountHandlerLogic.scala
@@ -302,7 +302,7 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
         sendResponse(ChatMsg(ChatMessageType.UNK_224, "@BailingMechanismFailure_Pilot"))
 
       case Mountable.CanNotDismount(obj: Vehicle, _, BailType.Bailed)
-        if {
+        if GlobalDefinitions.isFlightVehicle(obj.Definition) && {
           continent
             .blockMap
             .sector(obj)
diff --git a/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala b/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala
index 48a724db..1378dfe2 100644
--- a/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala
+++ b/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala
@@ -416,7 +416,7 @@ class ChatOperations(
     if (contents.startsWith("SH")) {
       channels.foreach {
         case _/*channel*/: SquadChannel =>
-          commandSendToRecipient(session, message, toChannel)
+          commandSendToRecipient(session, message, SquadChannel(sessionLogic.squad.squad_guid))
         case _ => ()
       }
     } else {