diff --git a/source/gameObjects/Character.hx b/source/gameObjects/Character.hx
index 0c1f3d6fb..bb57bc4de 100644
--- a/source/gameObjects/Character.hx
+++ b/source/gameObjects/Character.hx
@@ -611,7 +611,8 @@ class Character extends FNFSprite
 
 	override public function playAnim(AnimName:String, Force:Bool = false, Reversed:Bool = false, Frame:Int = 0):Void
 	{
-		super.playAnim(AnimName, Force, Reversed, Frame);
+		if (animation.getByName(AnimName) != null)
+			super.playAnim(AnimName, Force, Reversed, Frame);
 
 		if (curCharacter == 'gf')
 		{
diff --git a/source/gameObjects/userInterface/Notes/Note.hx b/source/gameObjects/userInterface/Notes/Note.hx
index d935d51ba..91a569bea 100644
--- a/source/gameObjects/userInterface/Notes/Note.hx
+++ b/source/gameObjects/userInterface/Notes/Note.hx
@@ -178,7 +178,13 @@ class Note extends FNFSprite
 			 */
 			final quantArray:Array<Int> = [4, 8, 12, 16, 20, 24, 32, 48, 64, 192]; // different quants
 
-			final beatTimeSeconds:Float = (60 / Conductor.bpm); // beat in seconds
+			var curBPM:Float = Conductor.bpm;
+			for (i in 0...Conductor.bpmChangeMap.length) {
+				if (strumTime > Conductor.bpmChangeMap[i].songTime)
+					curBPM = Conductor.bpmChangeMap[i].bpm;
+			}
+
+			final beatTimeSeconds:Float = (60 / curBPM); // beat in seconds
 			final beatTime:Float = beatTimeSeconds * 1000; // beat in milliseconds
 			// assumed 4 beats per measure?
 			final measureTime:Float = beatTime * 4;
diff --git a/source/meta/data/ChartLoader.hx b/source/meta/data/ChartLoader.hx
index 3e93bf308..2be54c9d8 100644
--- a/source/meta/data/ChartLoader.hx
+++ b/source/meta/data/ChartLoader.hx
@@ -32,8 +32,7 @@ class ChartLoader
 				// load fnf style charts (PRE 2.8)
 				var daBeats:Int = 0; // Not exactly representative of 'daBeats' lol, just how much it has looped
 
-				for (section in noteData)
-				{
+				for (section in noteData) {
 					var coolSection:Int = Std.int(section.lengthInSteps / 4);
 
 					for (songNotes in section.sectionNotes)