diff --git a/core/assets/sounds/ui/chatMessage.ogg b/core/assets/sounds/ui/chatMessage.ogg
new file mode 100644
index 0000000000..4d7e07ab4d
Binary files /dev/null and b/core/assets/sounds/ui/chatMessage.ogg differ
diff --git a/core/assets/sounds/windowHide.ogg b/core/assets/sounds/windowHide.ogg
deleted file mode 100644
index 9039d4e3b4..0000000000
Binary files a/core/assets/sounds/windowHide.ogg and /dev/null differ
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 9543605e0b..566b4cdb3d 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -198,6 +198,7 @@ public class NetClient implements ApplicationListener{
     public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){
         if(Vars.ui != null){
             Vars.ui.chatfrag.addMessage(message);
+            Sounds.chatMessage.play();
         }
 
         //display raw unformatted text above player head
@@ -212,6 +213,7 @@ public class NetClient implements ApplicationListener{
     public static void sendMessage(String message){
         if(Vars.ui != null){
             Vars.ui.chatfrag.addMessage(message);
+            Sounds.chatMessage.play();
         }
     }
 
diff --git a/core/src/mindustry/entities/effect/WrapEffect.java b/core/src/mindustry/entities/effect/WrapEffect.java
index 313aba5660..7eb1fa60e1 100644
--- a/core/src/mindustry/entities/effect/WrapEffect.java
+++ b/core/src/mindustry/entities/effect/WrapEffect.java
@@ -8,7 +8,7 @@ import mindustry.entities.*;
 public class WrapEffect extends Effect{
     public Effect effect = Fx.none;
     public Color color = Color.white.cpy();
-    public float rotation = Float.NaN;
+    public float rotation;
 
     public WrapEffect(){
     }
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 3d2d1cb2a0..1ba18b6f8f 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -443,6 +443,10 @@ public class ContentParser{
 
                 unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name);
 
+                if(value.has("class")){
+                    value.remove("class");
+                }
+
                 var typeVal = value.get("type");
 
                 if(typeVal != null && !typeVal.isString()){