diff --git a/admin/delete.c b/admin/delete.c
index 07335bb0a..af1c19f37 100644
--- a/admin/delete.c
+++ b/admin/delete.c
@@ -44,28 +44,28 @@ int
 del_entry(int argc, char **argv)
 {
     HDB *db;
-    int err;
+    krb5_error_code ret;
     hdb_entry ent;
     
     if(argc != 2){
-	warnx("Usage: del_entry principal");
+	krb5_warnx(context, "Usage: del_entry principal");
 	return 0;
     }
 	
     krb5_parse_name(context, argv[1], &ent.principal);
     
-    if((err = hdb_open(context, &db, database, O_RDWR, 0600))){
-	warnx("hdb_open: %s", krb5_get_err_text(context, err));
+    if((ret = hdb_open(context, &db, database, O_RDWR, 0600))){
+	krb5_warn(context, ret, "hdb_open");
 	return 0;
     }
     
-    err = db->delete(context, db, &ent);
+    ret = db->delete(context, db, &ent);
     
-    switch(err){
+    switch(ret){
     case 0: 
 	break;
     default:
-	warnx("delete: %s", krb5_get_err_text(context, err));;
+	krb5_warn(context, ret, "delete");
 	break;
     }
     krb5_free_principal (context, ent.principal);
diff --git a/admin/dump.c b/admin/dump.c
index 486176c30..d121cdf59 100644
--- a/admin/dump.c
+++ b/admin/dump.c
@@ -78,7 +78,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
 {
     char *p;
     char buf[1024] = "";
-    int i, j;
+    int i;
     krb5_unparse_name(context, ent->principal, &p);
     strcat(buf, p);
     strcat(buf, " ");
diff --git a/admin/extkeytab.c b/admin/extkeytab.c
index b795c6124..1d7c0decc 100644
--- a/admin/extkeytab.c
+++ b/admin/extkeytab.c
@@ -46,32 +46,29 @@ ext_keytab(int argc, char **argv)
     HDB *db;
     hdb_entry ent;
     int ret;
-    int i;
     krb5_keytab kid;
     krb5_keytab_entry key_entry;
-    char *p;
     
     if(argc < 2 || argc > 3){
-	warnx("Usage: ext_keytab principal [file]\n");
+	krb5_warnx(context, "Usage: ext_keytab principal [file]");
 	return 0;
     }
-	
     
     ret = hdb_open(context, &db, database, O_RDONLY, 0600);
     if(ret){
-	warnx("%s", krb5_get_err_text(context, ret));
+	krb5_warn(context, ret, "hdb_open");
 	return 0;
     }
 
     ret = krb5_parse_name (context, argv[1], &ent.principal);
     if (ret) {
-	warnx("%s", krb5_get_err_text(context, ret));
+	krb5_warn(context, ret, "krb5_parse_name");
 	goto cleanup1;
     }
 
     ret = db->fetch(context, db, &ent);
     if (ret) {
-	warnx ("%s", krb5_get_err_text(context, ret));
+	krb5_warn (context, ret, "db->fetch");
 	krb5_free_principal (context, ent.principal);
 	goto cleanup1;
     }
@@ -95,7 +92,7 @@ ext_keytab(int argc, char **argv)
     }
 
     if (ret) {
-	warnx("%s", krb5_get_err_text(context, ret));
+	krb5_warn(context, ret, "krb5_kt_resolve");
 	goto cleanup2;
     }
 
@@ -105,7 +102,7 @@ ext_keytab(int argc, char **argv)
     /* XXX - krb5_kt_free_entry? */
 
     if (ret) {
-	warnx("%s", krb5_get_err_text(context, ret));
+	krb5_warn(context, ret, "krb5_kt_add_entry");
     }
     krb5_kt_close (context, kid);
 cleanup2:
diff --git a/kadmin/dump.c b/kadmin/dump.c
index 486176c30..d121cdf59 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -78,7 +78,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
 {
     char *p;
     char buf[1024] = "";
-    int i, j;
+    int i;
     krb5_unparse_name(context, ent->principal, &p);
     strcat(buf, p);
     strcat(buf, " ");