diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index 819cbc61e8..2004529e11 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -312,7 +312,6 @@ void SoundMixBuffer::write(const Sint16 *buf, unsigned size)
 
 void SoundMixBuffer::read(Sint16 *buf)
 {
-	int clip=0;
 	for(unsigned pos = 0; pos < used; ++pos)
 	{
 		Sint32 out = (mixbuf[pos]) / 256;
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 80e5b93132..13049fef2e 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -185,11 +185,11 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 		case stage:
 			{
 				ASSERT( GAMESTATE->m_pCurNotes[p] );
-				float score;
+				int score;
 				if( PREFSMAN->m_bPercentageScoring )
 					score = stageStats.GetPercentDancePoints( (PlayerNumber)p );
 				else
-					score = float(stageStats.iScore[p] + stageStats.iBonus[p]);
+					score = stageStats.iScore[p] + stageStats.iBonus[p];
 				Steps::MemCardData::HighScore hs;
 				hs.grade = grade[p];
 				hs.iScore = score;
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 446acf33d7..9822decee4 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -465,6 +465,7 @@ static const ConfOption g_ConfOptions[] =
 	ConfOption( "Preload\nSounds",		PreloadSounds,		"NO","YES" ),
 	ConfOption( "Resampling\nQuality",	ResamplingQuality,	"FAST","NORMAL","HIGH QUALITY" ),
 	ConfOption( "Attract\nSound",		AttractSound,		"OFF","ON" ),
+	ConfOption( "Demonstartion\nSound",	DemonstrationSound,	"OFF","ON" ),
 	ConfOption( "Sound\nVolume",		SoundVolume,		"0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","10%" ),
 	ConfOption( "", NULL )	// end marker
 };
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 3e86466797..fcd34ff1b2 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -146,7 +146,6 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 	// init all the difficulty graphics
 	for( int d=0; d<NUM_DIFFICULTIES; d++ )
 	{
-		Difficulty diff = (Difficulty)d;
 		bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end();
 
 		m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) );
@@ -226,7 +225,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 		{
 			for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
 			{
-				for( unsigned j=0; j<NUM_SONGS_TO_SHOW; j++ )
+				for( int j=0; j<NUM_SONGS_TO_SHOW; j++ )
 				{
 					PageToShow pts;
 					pts.type = PageToShow::TYPE_SONG;
@@ -281,7 +280,7 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
 
 void ScreenRanking::SetPage( PageToShow pts )
 {
-	bool bShowNames, bShowScores, bShowPoints, bShowTime, bShowDifficulty, bShowPercent;
+	bool bShowNames=false, bShowScores=false, bShowPoints=false, bShowTime=false, bShowDifficulty=false, bShowPercent=false;
 	switch( pts.type )
 	{
 	case PageToShow::TYPE_CATEGORY:
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 9034103f33..0b30458fb4 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -65,8 +65,8 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                     	cl                                                                                                                                                                                                      /Zl                                                                                                                                                                                                      /nologo                                                                                                                                                                                                      /c                                                                                                                                                                                                      verstub.cpp \
-                                                                                                                                                                                                            /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                       	cl                                                                                                                                                                                                        /Zl                                                                                                                                                                                                        /nologo                                                                                                                                                                                                        /c                                                                                                                                                                                                        verstub.cpp \
+                                                                                                                                                                                                                /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -103,8 +103,8 @@ IntDir=.\Debug
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                      	cl                                                                                                                                                                                                       /Zl                                                                                                                                                                                                       /nologo                                                                                                                                                                                                       /c                                                                                                                                                                                                       verstub.cpp \
-                                                                                                                                                                                                              /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                        	cl                                                                                                                                                                                                         /Zl                                                                                                                                                                                                         /nologo                                                                                                                                                                                                         /c                                                                                                                                                                                                         verstub.cpp \
+                                                                                                                                                                                                                  /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -144,8 +144,8 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                     	cl                                                                                                                                                                                                      /Zl                                                                                                                                                                                                      /nologo                                                                                                                                                                                                      /c                                                                                                                                                                                                      verstub.cpp \
-                                                                                                                                                                                                            /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                       	cl                                                                                                                                                                                                        /Zl                                                                                                                                                                                                        /nologo                                                                                                                                                                                                        /c                                                                                                                                                                                                        verstub.cpp \
+                                                                                                                                                                                                                /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -186,8 +186,8 @@ IntDir=.\StepMania___Xbox_Release
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                       	cl                                                                                                                                                                                                        /Zl                                                                                                                                                                                                        /nologo                                                                                                                                                                                                        /c                                                                                                                                                                                                        verstub.cpp \
-                                                                                                                                                                                                                /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                         	cl                                                                                                                                                                                                          /Zl                                                                                                                                                                                                          /nologo                                                                                                                                                                                                          /c                                                                                                                                                                                                          verstub.cpp \
+                                                                                                                                                                                                                    /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool