diff --git a/.hgignore b/.hgignore
index 3382b3a54d..728337263b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -28,8 +28,8 @@ Thumbs.db
 Docs/doxygen
 PBProject/build
 Xcode/build
-Xcode/stepmania.xcodeproj/xcuserdata
-Xcode/stepmania.xcodeproj/project.xcworkspace/xcuserdata
+*.xcodeproj/xcuserdata
+*.xcodeproj/project.xcworkspace/xcuserdata
 src/build-*
 src/Release-*
 src/libtomcrypt/build-*
@@ -47,6 +47,10 @@ Themes/pump
 Themes/optical-release
 src/version.bin
 src/verstub.cpp
+Songs/*
+*.dmg
+.git
+*.smzip
 nsis_strings_temp.inc
 Data/SpeedMods.txt
 Program/StepMania*.lib
diff --git a/src/GameCommand.cpp b/src/GameCommand.cpp
index 4083307c14..6290cd3157 100644
--- a/src/GameCommand.cpp
+++ b/src/GameCommand.cpp
@@ -415,8 +415,8 @@ void GameCommand::LoadOne( const Command& cmd )
 		if( cmd.m_vsArgs.size() == 3 )
 		{
 			m_bFadeMusic = true;
-			m_fMusicFadeOutVolume = atof( cmd.m_vsArgs[1] );
-			m_fMusicFadeOutSeconds = atof( cmd.m_vsArgs[2] );
+			m_fMusicFadeOutVolume = (float)atof( cmd.m_vsArgs[1] );
+			m_fMusicFadeOutSeconds = (float)atof( cmd.m_vsArgs[2] );
 		}
 	}
 
diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp
index 7c84d9809f..3901ecde6e 100644
--- a/src/NotesLoaderSSC.cpp
+++ b/src/NotesLoaderSSC.cpp
@@ -126,7 +126,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
 
 	int state = GETTING_SONG_INFO;
 	const unsigned values = msd.GetNumValues();
-	Steps* pNewNotes;
+	Steps* pNewNotes = NULL;
 
 	for( unsigned i = 0; i < values; i++ )
 	{
@@ -1007,7 +1007,7 @@ bool SSCLoader::LoadEditFromFile( RString sEditFilePath, ProfileSlot slot, bool
 bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot, bool bAddStepsToSong )
 {
 	Song* pSong = NULL;
-	Steps* pNewNotes;
+	Steps* pNewNotes = NULL;
 	bool bSSCFormat = false;
 
 	for( unsigned i=0; i<msd.GetNumValues(); i++ )
diff --git a/src/RageDisplay_Legacy.cpp b/src/RageDisplay_Legacy.cpp
index 207e52ecb7..f938fabd7a 100644
--- a/src/RageDisplay_Legacy.cpp
+++ b/src/RageDisplay_Legacy.cpp
@@ -2642,7 +2642,7 @@ void RageDisplay_Legacy::SetSphereEnvironmentMapping( TextureUnit tu, bool b )
 	}
 }
 
-GLint iCelTexture1, iCelTexture2 = NULL;
+GLint iCelTexture1, iCelTexture2 = 0;
 
 void RageDisplay_Legacy::SetCelShaded( int stage )
 {
diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp
index f4610870d6..a0f0173819 100644
--- a/src/ScreenDebugOverlay.cpp
+++ b/src/ScreenDebugOverlay.cpp
@@ -216,6 +216,7 @@ void ScreenDebugOverlay::Init()
 		RString sPageName = (*p)->GetPageName();
 
 		DeviceInput di;
+		di.x = di.y = NULL;
 		switch( (*p)->GetType() )
 		{
 		case IDebugLine::all_screens: