diff --git a/Python/ceval.c b/Python/ceval.c
index 041ae4d..3fa03c0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -288,7 +288,7 @@
 #ifdef LLTRACE
 	int lltrace;
 #endif
-#ifdef DEBUG
+#if defined( DEBUG ) || defined( LLTRACE )
 	/* Make it easier to find out where we are with dbx */
 	char *filename = getstringvalue(co->co_filename);
 #endif
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 96f385f..734b72b 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -155,7 +155,7 @@
 	for (;;) {
 		ret = run_tty_1(fp, filename);
 #ifdef REF_DEBUG
-		fprintf(stderr, "[%ld refs]\n", ref_total);
+		fprintf(stderr, "[%ld refs]\n", _Py_RefTotal);
 #endif
 		if (ret == E_EOF)
 			return 0;
@@ -664,7 +664,7 @@
 	err_clear();
 
 #ifdef REF_DEBUG
-	fprintf(stderr, "[%ld refs]\n", ref_total);
+	fprintf(stderr, "[%ld refs]\n", _Py_RefTotal);
 #endif
 
 #ifdef TRACE_REFS