diff --git a/src/main/scala/net/psforever/actors/session/ChatActor.scala b/src/main/scala/net/psforever/actors/session/ChatActor.scala
index 4274fd7b8..bc6e96e26 100644
--- a/src/main/scala/net/psforever/actors/session/ChatActor.scala
+++ b/src/main/scala/net/psforever/actors/session/ChatActor.scala
@@ -1447,7 +1447,7 @@ class ChatActor(
     val tokenOpt = buffer.headOption
     val valueOpt = func(session, tokenOpt)
     val outBuffer = if (valueOpt.nonEmpty) {
-      buffer.tail
+      buffer.drop(1)
     } else {
       buffer
     }
diff --git a/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala b/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala
index d17bdef41..f9e289d5d 100644
--- a/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala
+++ b/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala
@@ -273,7 +273,7 @@ case object ZoneInfo extends IntEnum[ZoneInfo] {
         aliases = AliasLookup(facilities = Map(
           ("Zal", "Base_Alpha"),
           ("Rashnu", "Base_Bravo"),
-          ("Sraosha ", "Base_Charlie")
+          ("Sraosha", "Base_Charlie")
         ))
       )