diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp
index 9c62c324c8..db56f40d24 100644
--- a/stepmania/src/LuaManager.cpp
+++ b/stepmania/src/LuaManager.cpp
@@ -292,7 +292,7 @@ bool LuaManager::RunScript( const CString &sScript, const CString &sName, CStrin
 bool LuaManager::RunScript( const CString &sExpression, const CString &sName, int iReturnValues )
 {
 	CString sError;
-	if( !RunScript( sExpression, sName.size()? sName:"in", sError, iReturnValues ) )
+	if( !RunScript( sExpression, sName.size()? sName:CString("in"), sError, iReturnValues ) )
 	{
 		sError = ssprintf( "Lua runtime error parsing \"%s\": %s", sName.size()? sName.c_str():sExpression.c_str(), sError.c_str() );
 		Dialog::OK( sError, "LUA_ERROR" );
@@ -406,7 +406,13 @@ LuaFunction_NoArgs( Year, GetLocalTime().tm_year+1900 );
 LuaFunction_NoArgs( Weekday, GetLocalTime().tm_wday );
 LuaFunction_NoArgs( DayOfYear, GetLocalTime().tm_yday );
 
-LuaFunction_Str( Trace, (LOG->Trace("%s", str.c_str()),true) );
+static bool Trace( const CString &sString )
+{
+	LOG->Trace( "%s", sString.c_str() );
+	return true;
+}
+
+LuaFunction_Str( Trace, Trace(str) );
 
 /*
  * (c) 2004 Glenn Maynard
diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h
index 5e18728944..ce9457f7e0 100644
--- a/stepmania/src/LuaManager.h
+++ b/stepmania/src/LuaManager.h
@@ -6,6 +6,9 @@
 struct lua_State;
 typedef void (*RegisterWithLuaFn)(lua_State*);
 
+class LuaManager;
+extern LuaManager *LUA;
+
 namespace LuaHelpers
 {
 	template<class T>
@@ -133,8 +136,6 @@ public:
 		}
 	}
 
-extern LuaManager *LUA;
-
 #define REGISTER_WITH_LUA_FUNCTION( Fn ) \
 	class Register##Fn { public: Register##Fn() { LuaManager::Register( Fn ); } }; \
 	static Register##Fn register##Fn;