diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 0a1b3cdab3..3511c34e2d 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -647,20 +647,20 @@ static const Style g_Style_Pump_HalfDouble =
 	6,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-4, NULL },
-			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+4, NULL },
-			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-5, NULL },
+			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+5, NULL },
+			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+5, NULL },
 		},
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-4, NULL },
-			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+4, NULL },
-			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-5, NULL },
+			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+5, NULL },
+			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+5, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -687,28 +687,28 @@ static const Style g_Style_Pump_Double =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-4, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-4, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+4, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+4, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+4, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+4, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-5, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-5, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+5, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+5, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+5, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+5, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+5, NULL },
 		},
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-4, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-4, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+4, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+4, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+4, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+4, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-5, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-5, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+5, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+5, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+5, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+5, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+5, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -773,16 +773,16 @@ static const Style g_Style_Pump_Couple_Edit =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*5.0f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*4.0f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*3.0f-4, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*2.0f-4, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*1.0f-4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*1.0f+4, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*2.0f+4, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*3.0f+4, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*4.0f+4, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*5.0f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*5.0f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*4.0f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*3.0f-5, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*2.0f-5, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*1.0f-5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*1.0f+5, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*2.0f+5, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*3.0f+5, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*4.0f+5, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*5.0f+5, NULL },
 		},
 		{	// PLAYER_2
 			{ TRACK_1,	-PUMP_COL_SPACING*2.0f, NULL },
@@ -816,28 +816,28 @@ static const Style g_Style_Pump_Routine =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-4, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-4, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+4, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+4, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+4, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+4, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-5, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-5, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+5, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+5, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+5, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+5, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+5, NULL },
 		},
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-4, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-4, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-4, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-4, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-4, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+4, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+4, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+4, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+4, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+4, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-5, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-5, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-5, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-5, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-5, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+5, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+5, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+5, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+5, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+5, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
diff --git a/src/NotesLoaderKSF.cpp b/src/NotesLoaderKSF.cpp
index 4186b77bfc..10cce4cd11 100644
--- a/src/NotesLoaderKSF.cpp
+++ b/src/NotesLoaderKSF.cpp
@@ -456,7 +456,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
 			// CheckpointsUseTimeSignatures metric. -aj
 			TimeSignatureSegment seg;
 			seg.m_iStartRow = BeatToNoteRow(0.0f);
-			seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT ); 
+			seg.m_iNumerator = iTickCount > ROWS_PER_BEAT ? ROWS_PER_BEAT : iTickCount;
 			seg.m_iDenominator = 4; 
 			out.m_Timing.AddTimeSignatureSegment( seg );
 		}
@@ -565,7 +565,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
 						iTickCount = (int)numTemp;
 						TimeSignatureSegment seg;
 						seg.m_iStartRow = BeatToNoteRow(fCurBeat);
-						seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT);
+						seg.m_iNumerator = iTickCount > ROWS_PER_BEAT ? ROWS_PER_BEAT : iTickCount;
 						seg.m_iDenominator = 4;
 						out.m_Timing.AddTimeSignatureSegment( seg );