diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index 6202fd072e..30388f673f 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -325,7 +325,7 @@ void RageSoundManager::AddLoadedSound( const RString &sPath_, RageSoundReader_Pr
 	it = m_mapPreloadedSounds.find( sPath );
 	ASSERT_M( it == m_mapPreloadedSounds.end(), sPath );
 	
-	m_mapPreloadedSounds[sPath] = (RageSoundReader_Preload *) pSound->Copy();
+	m_mapPreloadedSounds[sPath] = pSound->Copy();
 }
 
 
diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp
index 162da6576b..c1d100c68c 100644
--- a/stepmania/src/RageSoundReader_MP3.cpp
+++ b/stepmania/src/RageSoundReader_MP3.cpp
@@ -1047,12 +1047,12 @@ int RageSoundReader_MP3::GetLengthInternal( bool fast )
 
 int RageSoundReader_MP3::GetLengthConst( bool fast ) const
 {
-	RageSoundReader_MP3 *cpy = (RageSoundReader_MP3 *) Copy();
+	RageSoundReader_MP3 *pCopy = this->Copy();
 
-	int length = cpy->GetLengthInternal( fast );
+	int iLength = pCopy->GetLengthInternal( fast );
 
-	delete cpy;
-	return length;
+	delete pCopy;
+	return iLength;
 }