diff --git a/source/funkin/backend/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx
index e950fa9e..fe20fd95 100644
--- a/source/funkin/backend/chart/Chart.hx
+++ b/source/funkin/backend/chart/Chart.hx
@@ -119,8 +119,9 @@ class Chart {
 
 				for (event in cast(data.events, Array<Dynamic>)) {
 					if (Reflect.hasField(event, "type")) {
-						event.name = eventTypesToString[event.type];
-						event.type = null;
+						if(event.type != null)
+							event.name = eventTypesToString[event.type];
+						Reflect.deleteField(event, "type");
 					}
 				}
 
diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx
index 89b56a43..aec1ed7e 100644
--- a/source/funkin/editors/charter/CharterNote.hx
+++ b/source/funkin/editors/charter/CharterNote.hx
@@ -82,6 +82,9 @@ class CharterNote extends UISprite {
 
 		if (angle == destAngle) return;
 
+		if(angleTween != null)
+			angleTween.cancel();
+
 		angleTween = FlxTween.tween(this, {angle: destAngle}, 2/3, {ease: function(t) {
 			return ((Math.sin(t * Math.PI) * 0.35) * 3 * t * Math.sqrt(1 - t)) + t;
 		}});
@@ -90,6 +93,7 @@ class CharterNote extends UISprite {
 	public override function kill() {
 		if (angleTween != null) {
 			angleTween.cancel();
+			angleTween = null;
 			angle = switch(animation.curAnim.curFrame = (id % 4)) {
 				case 0: -90;
 				case 1: 180;