diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index 5bf51e32e0..5fa7410c0c 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -83,7 +83,7 @@ void ComboGraph::Load( const StageStats &s, const PlayerStageStats &pss )
 		if( !bIsMax )
 			continue;
 
-		BitmapText *pText = (BitmapText *) m_pMaxComboText->Copy(); // XXX Copy should be covariant
+		BitmapText *pText = dynamic_cast<BitmapText*>( m_pMaxComboText->Copy() ); // XXX Copy should be covariant
 
 		const float fStart = SCALE( combo.fStartSecond, fFirstSecond, fLastSecond, 0.0f, 1.0f );
 		const float fSize = SCALE( combo.fSizeSeconds, 0, fLastSecond-fFirstSecond, 0.0f, 1.0f );
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 0f19f4b4c5..c77d536aac 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -150,7 +150,7 @@ MusicWheelItem::~MusicWheelItem()
 
 void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD )
 {
-	const WheelItemData *pWID = (const WheelItemData *) pWIBD; // XXX: ugly cast
+	const WheelItemData *pWID = dynamic_cast<const WheelItemData*>( pWIBD ); // XXX: ugly cast
 	
 	ASSERT( pWID != NULL );
 	data = pWID;