diff --git a/src/RageLog.cpp b/src/RageLog.cpp
index 8e619766a8..d3dda497de 100644
--- a/src/RageLog.cpp
+++ b/src/RageLog.cpp
@@ -353,7 +353,7 @@ void RageLog::AddToRecentLogs( const RString &str )
 const char *RageLog::GetRecentLog( int n )
 {
 	if( n >= BACKLOG_LINES || n >= backlog_cnt )
-		return false;
+		return NULL;
 
 	if( backlog_cnt == BACKLOG_LINES )
 	{
diff --git a/src/RageSurfaceUtils.cpp b/src/RageSurfaceUtils.cpp
index 4d27424765..3a0fa68f26 100644
--- a/src/RageSurfaceUtils.cpp
+++ b/src/RageSurfaceUtils.cpp
@@ -772,7 +772,7 @@ RageSurface *RageSurfaceUtils::LoadSurface( RString file )
 {
 	RageFile f;
 	if( !f.Open( file ) )
-		return false;
+		return NULL;
 
 	SurfaceHeader h;
 	if( f.Read( &h, sizeof(h) ) != sizeof(h) )
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index 16509bc957..2ffa3813ff 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -1545,7 +1545,7 @@ void SongManager::UpdatePreferredSort(RString sPreferredSongs, RString sPreferre
 			}
 			else
 			{
-				/* if the line ends in "/*", check if the section exists,
+				/* if the line ends in slash-star, check if the section exists,
 				 * and if it does, add all the songs in that group to the list. */
 				if( EndsWith(sLine,"/*") )
 				{
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 0dd9dad3aa..32caa259d4 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -699,7 +699,7 @@ void MovieDecoder_FFMpeg::Close()
 
 	if( m_fctx )
 	{
-		avcodec::av_close_input_file( m_fctx );
+		avcodec::avformat_close_input( &m_fctx );
 		m_fctx = NULL;
 	}