diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
index 9ceb021b..c5f9f6ea 100644
--- a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
+++ b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
@@ -19,7 +19,7 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
         DressBattleRank(obj),
         DressCommandRank(obj),
         recursiveMakeImplantEffects(obj.Implants.iterator),
-        None, //TODO cosmetics
+        MakeCosmetics(obj.BEP),
         InventoryData(MakeHolsters(obj, BuildEquipment).sortBy(_.parentSlot)), //TODO is sorting necessary?
         GetDrawnSlot(obj)
       )
@@ -138,12 +138,12 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
     (0 until numImplants).map(index => {
       val slot = implants(index)
       slot.Installed match {
-        case Some(_) =>
+        case Some(implant) =>
           if(slot.Initialized) {
             ImplantEntry(slot.Implant, None)
           }
           else {
-            ImplantEntry(slot.Implant, Some(slot.Installed.get.Initialization.toInt))
+            ImplantEntry(slot.Implant, Some(implant.Initialization.toInt))
           }
         case None =>
           ImplantEntry(ImplantType.None, None)
@@ -173,10 +173,13 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
             Some(ImplantEffects.PersonalShieldEffects)
           case Some(`surge`) =>
             Some(ImplantEffects.SurgeEffects)
-          case _ => ;
+          case _ =>
+            recursiveMakeImplantEffects(iter)
         }
       }
-      recursiveMakeImplantEffects(iter)
+      else {
+        recursiveMakeImplantEffects(iter)
+      }
     }
   }