diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index 468ad0816a5..0cc2df6e4f3 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -26,7 +26,7 @@ using StringTools;
 
 class MainMenuState extends MusicBeatState
 {
-	public static var psychEngineJSVersion:String = '1.24.1'; //This is also used for Discord RPC
+	public static var psychEngineJSVersion:String = '1.24.2'; //This is also used for Discord RPC
 	public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
 	public static var curSelected:Int = 0;
 
diff --git a/source/Note.hx b/source/Note.hx
index 74e8f80e758..12d82ec4d9b 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -416,6 +416,7 @@ class Note extends FlxSprite
 		isSustainNote = chartNoteData.isSustainNote;
 		if (chartNoteData.noteskin.length > 0 && chartNoteData.noteskin != '' && chartNoteData.noteskin != texture) texture = 'noteskins/' + chartNoteData.noteskin;
 		if (chartNoteData.texture.length > 0 && chartNoteData.texture != texture) texture = chartNoteData.texture;
+		if (chartNoteData.noteskin.length < 1 && chartNoteData.texture != Paths.defaultSkin) texture = Paths.defaultSkin;
 		sustainLength = chartNoteData.sustainLength;
 		sustainScale = chartNoteData.sustainScale;
 		lowPriority = chartNoteData.lowPriority;
@@ -489,6 +490,7 @@ class Note extends FlxSprite
 			if (alpha != 1) alpha = 1;
 		}
 		if (flipY) flipY = false;
+		if (PlayState != null) cameras = [isSustainNote ? PlayState.instance.camHUDBelow : PlayState.instance.camHUD];
 		clipRect = null;
 		alpha = 1;
 		return this;
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 5810578f74d..7b5fc7b9fcd 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -6259,7 +6259,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
 
 					if (combo < 0) combo = 0;
 					if (polyphony > 1 && !note.isSustainNote) totalNotes += polyphony - 1;
-				if (!note.isSustainNote && !cpuControlled && !ClientPrefs.lessBotLag || !note.isSustainNote && cpuControlled && ClientPrefs.communityGameBot)
+				if (!note.isSustainNote && !cpuControlled || !note.isSustainNote && cpuControlled && ClientPrefs.communityGameBot)
 				{
 					combo += 1 * polyphony;
 					totalNotesPlayed += 1 * polyphony;
@@ -6268,7 +6268,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
 					inline notesHitArray.push(1 * polyphony);
 					inline notesHitDateArray.push(Conductor.songPosition);
 					}
-					if (!ClientPrefs.lessBotLag) popUpScore(note);
+					if (!ClientPrefs.lessBotLag || ClientPrefs.communityGameBot) popUpScore(note);
 					else
 					{
 						final noteDiff:Float = Math.abs(note.strumTime - Conductor.songPosition + ClientPrefs.ratingOffset) / playbackRate;