diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index ada6f0c4e3..9414998d32 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -65,7 +65,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania\Program
 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
 
@@ -142,7 +142,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania\Program
 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
 
@@ -2156,6 +2156,25 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.cpp
+
+!IF  "$(CFG)" == "StepMania - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
index 6d437ceaf0..d220146d8a 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
@@ -99,7 +99,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
 
 			/* Note that, until we call advance_read_pointer, we can safely write to p[0]. */
 			const int frames_to_read = min( frames_left, p[0]->frames_in_buffer );
-			mix.write( p[0]->p, frames_to_read * channels, s.volume, got_frames*channels );
+			mix.write( (Sint16*)p[0]->p, frames_to_read * channels, s.volume, got_frames*channels );
 
 			SOUNDMAN->CommitPlayingPosition( s.sound_id, frameno+got_frames, p[0]->position, frames_to_read );
 
@@ -117,7 +117,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
 	}
 
 	memset( buf, 0, frames*bytes_per_frame );
-	mix.read( buf );
+	mix.read( (Sint16*)buf );
 }