diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index c04c01d845a9e169cfeddfc47765ed451ab00f42..d0732d24f21280348293adb703565bab44eb1ea8 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1111,10 +1111,10 @@ dorename(
 			pctrls, NULL, &msgid );
 		if ( rc != LDAP_SUCCESS ) {
 			fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
-			ldap_perror( ld, "ldap_modrdn" );
+			ldap_perror( ld, "ldap_rename" );
 			goto done;
 		} else {
-			printf( _("modrdn completed\n") );
+			printf( _("rename completed\n") );
 		}
 
 		rc = process_response( ld, msgid, "ldap_rename", dn );
diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 128aeba569e139246372e7140d78724222b8c824..47253b159c682f892767f4f5729ef5d18b784eb2 100644
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -116,7 +116,7 @@ main( int argc, char *argv[] )
 	char		*matcheddn = NULL, *text = NULL, **refs = NULL;
 	char		*retoid = NULL;
 	struct berval	*retdata = NULL;
-	int		id, code;
+	int		id, code=0;
 	LDAPMessage	*res;
 
 	tool_init();