diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 5b0c6ed0d4..c010e5395f 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -124,7 +124,7 @@ install-conf: FORCE
 			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
-		$(RM) -f /tmp/slapd.$$ ; \
+		$(RM) -f $$tmpcf ; \
 	done
 
 install-tools: FORCE
diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index f8feaebf0a..88edf68724 100644
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -156,6 +156,7 @@ char *derefDN ( Backend     *be,
 	  free (newDN);
 	  newDN = NULL;
 	  free (remainder);
+	  remainder = NULL;
 	  break; /*  no associated entry, dont deref */
 	}
 	else {