diff --git a/src/NotesLoaderBMS.cpp b/src/NotesLoaderBMS.cpp
index f2ceb79164..75955affa3 100644
--- a/src/NotesLoaderBMS.cpp
+++ b/src/NotesLoaderBMS.cpp
@@ -447,6 +447,7 @@ struct BMSChartInfo {
 	RString artist;
 	RString genre;
 
+	RString bannerFile;
 	RString backgroundFile;
 	RString stageFile;
 	RString musicFile;
@@ -525,6 +526,10 @@ void BMSChartReader::ReadHeaders()
 		{
 			info.genre = it->second;
 		}
+		else if( it->first == "#banner" )
+		{
+			info.bannerFile = it->second;
+		}
 		else if( it->first == "#backbmp" )
 		{
 			/* XXX: don't use #backbmp if StepsType is beat-*.
@@ -982,8 +987,7 @@ bool BMSChartReader::ReadNoteData()
 			{
 				if( nd.GetTapNote( t, row ) == TAP_EMPTY && !nd.IsHoldNoteAtRow( t, row ) )
 				{
-					TapNote tn = TAP_ORIGINAL_TAP;
-					tn.type = TapNote::autoKeysound;
+					TapNote tn = TAP_ORIGINAL_AUTO_KEYSOUND;
 					tn.iKeysoundIndex = ak.index;
 					nd.SetTapNote( t, row, tn );
 					found = true;
@@ -1173,6 +1177,7 @@ void BMSSongLoader::AddToSong()
 			NotesLoader::GetMainAndSubTitlesFromFullTitle( main.info.title, out->m_sMainTitle, out->m_sSubTitle );
 		out->m_sArtist = main.info.artist;
 		out->m_sGenre = main.info.genre;
+		out->m_sBannerFile = main.info.bannerFile;
 
 		switch( main.steps->m_StepsType )
 		{