diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index 85b27e2819..9cd7cf0d84 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -87,7 +87,7 @@ BitmapText::~BitmapText()
 
 bool BitmapText::LoadFromFont( CString sFontFilePath )
 {
-	LOG->Trace( "BitmapText::LoadFromFontName(%s)", sFontFilePath.GetString() );
+	Checkpoint( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.GetString()) );
 
 	if( m_pFont ) {
 		FONT->UnloadFont( m_pFont );
@@ -105,7 +105,7 @@ bool BitmapText::LoadFromFont( CString sFontFilePath )
 
 bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
 {
-	LOG->Trace( "BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.GetString(), sChars.GetString() );
+	Checkpoint( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.GetString(), sChars.GetString()) );
 
 	if( m_pFont ) {
 		FONT->UnloadFont( m_pFont );
diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index a959098981..c65373e4a0 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -745,7 +745,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
 	}
 
 	/* The font is not already loaded.  Figure out what we have. */
-	LOG->Trace( "FontManager::LoadFont(\"%s\",\"%s\").", sFontOrTextureFilePath.GetString(), Chars.GetString() );
+	Checkpoint( ssprintf("Font::Load(\"%s\",\"%s\").", sFontOrTextureFilePath.GetString(), Chars.GetString()) );
 
 	path = sFontOrTextureFilePath;
 	Chars = sChars;
diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp
index cbef0560e3..5ffd2d7e04 100644
--- a/stepmania/src/FontManager.cpp
+++ b/stepmania/src/FontManager.cpp
@@ -90,7 +90,7 @@ Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sCha
 
 void FontManager::UnloadFont( Font *fp )
 {
-	LOG->Trace( "FontManager::UnloadFont(%s).", fp->path.GetString() );
+	Checkpoint( ssprintf("FontManager::UnloadFont(%s).", fp->path.GetString()) );
 
 	for( std::map<CString, Font*>::iterator i = m_mapPathToFont.begin();
 		i != m_mapPathToFont.end(); ++i)
diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp
index 4e14a30bf3..0a18293d2d 100644
--- a/stepmania/src/RageTextureManager.cpp
+++ b/stepmania/src/RageTextureManager.cpp
@@ -58,7 +58,7 @@ void RageTextureManager::Update( float fDeltaTime )
 //-----------------------------------------------------------------------------
 RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
 {
-	LOG->Trace( "RageTextureManager::LoadTexture(%s).", ID.filename.GetString() );
+	Checkpoint( ssprintf( "RageTextureManager::LoadTexture(%s).", ID.filename.GetString() ) );
 
 	/* We could have two copies of the same bitmap if there are equivalent but
 	 * different paths, e.g. "Bitmaps\me.bmp" and "..\Rage PC Edition\Bitmaps\me.bmp". */
@@ -67,6 +67,7 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
 	{
 		/* Found the texture.  Just increase the refcount and return it. */
 		p->second->m_iRefCount++;
+		LOG->UnmapLog( "LoadTexture" );
 		return p->second;
 	}
 
@@ -81,10 +82,9 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
 	else
 		pTexture = new RageBitmapTexture( ID );
 
-	LOG->Trace( "RageTextureManager: Loaded '%s'.", ID.filename.GetString() );
-
 	m_mapPathToTexture[ID] = pTexture;
 
+	LOG->UnmapLog( "LoadTexture" );
 	return pTexture;
 }