diff --git a/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala b/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala
index beaffd21..0fe3cb82 100644
--- a/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala
+++ b/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala
@@ -21,14 +21,24 @@ final case class DamageFeedbackMessage(unk1 : Int,
                                        unk6 : Int)
   extends PlanetSideGamePacket {
   assert(
-    if(unk2a.nonEmpty) unk2b.isEmpty && unk2c.isEmpty
-    else if(unk2b.nonEmpty) unk2 && unk2a.isEmpty && unk2c.isEmpty
-    else unk2a.isEmpty && !unk2 && unk2b.isEmpty && unk2c.nonEmpty
+    {
+      val unk2aEmpty = unk2a.isEmpty
+      val unk2bEmpty = unk2b.isEmpty
+      val unk2cEmpty = unk2c.isEmpty
+      if(unk2a.nonEmpty) unk2bEmpty && unk2cEmpty
+      else if(unk2b.nonEmpty) unk2 && unk2aEmpty && unk2cEmpty
+      else unk2aEmpty && !unk2 && unk2bEmpty && unk2c.nonEmpty
+    }
   )
   assert(
-    if(unk3a.nonEmpty) unk3b.isEmpty && unk3c.isEmpty
-    else if(unk3b.nonEmpty) unk3 && unk3a.isEmpty && unk3c.isEmpty
-    else unk3a.isEmpty && !unk3 && unk3b.isEmpty && unk3c.nonEmpty
+    {
+      val unk3aEmpty = unk3a.isEmpty
+      val unk3bEmpty = unk3b.isEmpty
+      val unk3cEmpty = unk3c.isEmpty
+      if(unk3a.nonEmpty) unk3bEmpty && unk3cEmpty
+      else if(unk3b.nonEmpty) unk3 && unk3aEmpty && unk3cEmpty
+      else unk3aEmpty && !unk3 && unk3bEmpty && unk3c.nonEmpty
+    }
   )
   assert(unk3a.isEmpty == unk3d.nonEmpty)
 
diff --git a/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala b/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala
index 59e64d5f..08f78e9e 100644
--- a/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala
+++ b/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala
@@ -6,6 +6,13 @@ import net.psforever.types.Angular
 import scodec.Codec
 import scodec.codecs._
 
+/**
+  * na
+  * @param guid1 na
+  * @param unk1 na
+  * @param guid2 na
+  * @param unk2 na
+  */
 final case class DamageMessage(guid1 : PlanetSideGUID,
                                unk1 : Int,
                                guid2 : PlanetSideGUID,
diff --git a/common/src/test/scala/game/DamageFeedbackMessageTest.scala b/common/src/test/scala/game/DamageFeedbackMessageTest.scala
index e2f1cebf..983a6f7d 100644
--- a/common/src/test/scala/game/DamageFeedbackMessageTest.scala
+++ b/common/src/test/scala/game/DamageFeedbackMessageTest.scala
@@ -37,7 +37,7 @@ class DamageFeedbackMessageTest extends Specification {
     pkt mustEqual string
   }
 
-  "failures" in {
+  "assert catches" in {
     //unk2: no parameters
     DamageFeedbackMessage(3, true, None, None, None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
     //unk2: two exclusive parameters
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index b0e6f5a5..400952c6 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -165,7 +165,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
   var cargoDismountTimer : Cancellable = DefaultCancellable.obj
   var antChargingTick : Cancellable = DefaultCancellable.obj
   var antDischargingTick : Cancellable = DefaultCancellable.obj
-  var weaponAutoLockDecay : Cancellable = DefaultCancellable.obj
 
 
   /**
@@ -3491,7 +3490,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
       import net.psforever.types.CertificationType._
 
       val faction = PlanetSideEmpire.VS
-      val avatar = new Avatar(41605313L+sessionId, s"TestCharacter$sessionId", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1)
+      val avatar = new Avatar(41605313L+sessionId, s"TestCharacter$sessionId", faction, CharacterGender.Female, 41, CharacterVoice.Voice1)
       avatar.Certifications += StandardAssault
       avatar.Certifications += MediumAssault
       avatar.Certifications += StandardExoSuit