diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index 28d53eb7b71a38a7a5513b5aacd65cd70a6be8f6..75cd074db2c0ec112a4126c66b58441d6a97b941 100644
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -228,7 +228,7 @@ char *derefDN ( Backend     *be,
    */
   if (depth >= be->be_maxDerefDepth) {
     Debug( LDAP_DEBUG_TRACE, 
-	   "<= max deref depth exceeded in derefDN for %s, result %s\n", 
+	   "<= max deref depth exceeded in derefDN for \"%s\", result \"%s\"\n", 
 	   dn, newDN, 0 );
     send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM, "",
 		      "Maximum alias dereference depth exceeded for base" );
@@ -238,7 +238,7 @@ char *derefDN ( Backend     *be,
     newDN = ch_strdup ( dn );
   }
   
-  Debug( LDAP_DEBUG_TRACE, "<= returning deref DN of  %s\n", newDN, 0, 0 ); 
+  Debug( LDAP_DEBUG_TRACE, "<= returning deref DN of \"%s\"\n", newDN, 0, 0 ); 
   if (matched != NULL) free(matched);
 
   return newDN;
diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 92336d1ce0628a494e909e190327ccb4445a0784..7cc4aec1e20facc0fd999993ffdcfa33430ab42a 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -163,7 +163,7 @@ dn2entry(
 	Entry		*e = NULL;
 	char		*pdn;
 
-	Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
+	Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
 		rw ? "w" : "r", dn, 0);
 
 	*matched = NULL;
diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index aa8a79cecdec28aed1dd913ef2d2b3541a1d1f84..d8e1db98865458584c138f1feb5b2a0f94e739d9 100644
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -84,7 +84,7 @@ id2children_remove(
 	key.dsize = strlen( buf ) + 1;
 
 	if ( idl_delete_key( be, db, key, e->e_id ) != 0 ) {
-		Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_insert)\n",
+		Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_delete)\n",
 		    0, 0, 0 );
 		ldbm_cache_close( be, db );
 		return( -1 );