diff --git a/src/Etterna/Globals/SoloCalc.cpp b/src/Etterna/Globals/SoloCalc.cpp
index 8b3527f2b2..b1f63cab93 100644
--- a/src/Etterna/Globals/SoloCalc.cpp
+++ b/src/Etterna/Globals/SoloCalc.cpp
@@ -12,7 +12,7 @@
 using namespace ::std;
 
 const float finalscaler = 2.564f * 1.05f * 1.1f * 1.10f * 1.10f *
-						  1.025; // multiplier to standardize baselines
+						  1.025f; // multiplier to standardize baselines
 
 inline void
 Smooth(vector<float>& input, float neutral)
@@ -158,7 +158,7 @@ SoloCalc(const std::vector<NoteInfo>& notes, float music_rate, float goal)
 			// why does this OOB calcing certain files if we don't include the
 			// bounds check?
 			while ((scaledtime > static_cast<float>(Interval + 1) * 0.5f) &&
-				   Interval < (AllIntervals[t].size() - 1))
+				   Interval < static_cast<int>(AllIntervals[t].size() - 1))
 				++Interval;
 
 			if (i.notes & column) {
diff --git a/src/Etterna/Singletons/ScoreManager.cpp b/src/Etterna/Singletons/ScoreManager.cpp
index 0f9a2e77bd..ba3eef5c99 100644
--- a/src/Etterna/Singletons/ScoreManager.cpp
+++ b/src/Etterna/Singletons/ScoreManager.cpp
@@ -528,12 +528,10 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld, const string& profileID)
 				totalscorenotes += hs->GetTapNoteScore(TNS_W5);
 				totalscorenotes += hs->GetTapNoteScore(TNS_Miss);
 
-				if (totalstepsnotes - totalscorenotes == 0)
+				if (totalstepsnotes == totalscorenotes)
 					hs->SetChordCohesion(1); // the set function isn't inverted
 											 // but the get function is, this
 											 // sets bnochordcohesion to 1
-				else
-					hs->SetChordCohesion(0);
 			}
 		};
 	auto onUpdate = [ld](int progress) {