diff --git a/Themes/_fallback/Scripts/04 CreditsHelpers.lua b/Themes/_fallback/Scripts/04 CreditsHelpers.lua
index 02f121acd9..185e032a24 100644
--- a/Themes/_fallback/Scripts/04 CreditsHelpers.lua	
+++ b/Themes/_fallback/Scripts/04 CreditsHelpers.lua	
@@ -50,8 +50,9 @@ local stepmania_credits= {
 	{
 		name= "Translators",
 		"John Reactor (Polish)",
-		"Jarosław Pietras (Polish)",
+		"Jarosław Pietras (Polish update for 5.0.5)",
 		"DHalens (Spanish)",
+		"Alejandro G. de la Muñoza (Spanish update for 5.0.5)",
 		"@Niler_jp (Japanese)",
 		"Deamon007 (Dutch)"
 	},
diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp
index 7a0ffec00a..4bbf75fc84 100644
--- a/src/ScreenEvaluation.cpp
+++ b/src/ScreenEvaluation.cpp
@@ -258,7 +258,8 @@ void ScreenEvaluation::Init()
 	{
 		if( SUMMARY )
 		{
-			for( unsigned i=0; i<m_pStageStats->m_vpPlayedSongs.size(); i++ )
+			for( size_t i=0; i<m_pStageStats->m_vpPlayedSongs.size()
+						 && i < MAX_SONGS_TO_SHOW; i++ )
 			{
 				Song *pSong = m_pStageStats->m_vpPlayedSongs[i];