diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj
index 180f658b6c..8edf41e019 100644
--- a/Xcode/stepmania.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania.xcodeproj/project.pbxproj
@@ -8004,6 +8004,7 @@
 					LUA_USE_MACOSX,
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				GCC_WARN_SHADOW = NO;
@@ -8358,6 +8359,7 @@
 					LUA_USE_MACOSX,
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				GCC_WARN_SHADOW = NO;
@@ -8382,6 +8384,7 @@
 					LUA_USE_MACOSX,
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				GCC_WARN_SHADOW = NO;
@@ -8406,6 +8409,7 @@
 					LUA_USE_MACOSX,
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				GCC_WARN_SHADOW = NO;
diff --git a/src/GameplayAssist.cpp b/src/GameplayAssist.cpp
index af05a52ed4..4ecd6be014 100644
--- a/src/GameplayAssist.cpp
+++ b/src/GameplayAssist.cpp
@@ -47,7 +47,7 @@ void GameplayAssist::PlayTicks( const NoteData &nd, const PlayerState *ps )
 			if( nd.IsThereATapOrHoldHeadAtRow( r ) )
 				iClapRow = r;
 
-		if( iClapRow != -1 )
+		if( iClapRow != -1 && !timing.IsWarpAtRow( iClapRow ) && !timing.IsFakeAtRow( iClapRow ) )
 		{
 			const float fTickBeat = NoteRowToBeat( iClapRow );
 			const float fTickSecond = timing.GetElapsedTimeFromBeatNoOffset( fTickBeat );
diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp
index fc67e3b598..347399adfa 100644
--- a/src/NotesLoaderSMA.cpp
+++ b/src/NotesLoaderSMA.cpp
@@ -319,9 +319,12 @@ void SMALoader::ProcessSpeeds( TimingData &out, const int iRowsPerBeat, const RS
 	FOREACH_CONST( RString, vs1, s1 )
 	{
 		vector<RString> vs2;
-		split( *s1, "=", vs2 );
+		vs2.clear(); // trying something.
+		RString loopTmp = *s1;
+		Trim( loopTmp );
+		split( loopTmp, "=", vs2 );
 		
-		if( RowToBeat(vs2[0], iRowsPerBeat) == 0 && vs2.size() == 2 ) // First one always seems to have 2.
+		if( vs2.size() == 2 ) // First one always seems to have 2.
 		{
 			vs2.push_back("0");
 		}
@@ -656,12 +659,16 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out )
 		{
 			TimingData &timing = (state == SMA_GETTING_STEP_INFO 
 					      ? pNewNotes->m_Timing : out.m_SongTiming);
-			ProcessSpeeds( timing, iRowsPerBeat, sParams[1] );
+			RString tmp = sParams[1];
+			Trim( tmp );
+			ProcessSpeeds( timing, iRowsPerBeat, tmp );
 		}
 		
 		else if( sValueName=="MULTIPLIER" )
 		{
-			ProcessMultipliers( pNewNotes->m_Timing, iRowsPerBeat, sParams[1] );
+			TimingData &timing = (state == SMA_GETTING_STEP_INFO 
+					      ? pNewNotes->m_Timing : out.m_SongTiming);
+			ProcessMultipliers( timing, iRowsPerBeat, sParams[1] );
 		}
 		
 		else if( sValueName=="FAKES" )