diff --git a/appl/ftp/ftp/gssapi.c b/appl/ftp/ftp/gssapi.c
index 29be7641c..b287b74a8 100644
--- a/appl/ftp/ftp/gssapi.c
+++ b/appl/ftp/ftp/gssapi.c
@@ -114,20 +114,21 @@ gss_overhead(void *app_data, int level, int len)
 static int
 gss_encode(void *app_data, void *from, int length, int level, void **to)
 {
-    OM_uint32 maj_stat, min_stat;
+    OM_uint32 min_stat;
     gss_buffer_desc input, output;
     int conf_state;
     struct gssapi_data *d = app_data;
 
     input.length = length;
     input.value = from;
-    maj_stat = gss_wrap (&min_stat,
-			 d->context_hdl,
-			 level == prot_private,
-			 GSS_C_QOP_DEFAULT,
-			 &input,
-			 &conf_state,
-			 &output);
+    /* XXX We should really display the major status... */
+    (void) gss_wrap(&min_stat,
+		    d->context_hdl,
+		    level == prot_private,
+		    GSS_C_QOP_DEFAULT,
+		    &input,
+		    &conf_state,
+		    &output);
     *to = output.value;
     return output.length;
 }
diff --git a/appl/gssmask/gssmask.c b/appl/gssmask/gssmask.c
index 916837b42..98a073849 100644
--- a/appl/gssmask/gssmask.c
+++ b/appl/gssmask/gssmask.c
@@ -427,7 +427,6 @@ HandleOP(AcceptContext)
     gss_ctx_id_t ctx;
     gss_cred_id_t deleg_cred = GSS_C_NO_CREDENTIAL;
     gss_buffer_desc input_token, output_token;
-    gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER;
 
     ret32(c, hContext);
     ret32(c, flags);
@@ -440,7 +439,6 @@ HandleOP(AcceptContext)
     if (in_token.length) {
 	input_token.length = in_token.length;
 	input_token.value = in_token.data;
-	input_token_ptr = &input_token;
     } else {
 	input_token.length = 0;
 	input_token.value = NULL;
diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index 428a40507..b8ab7c8c9 100644
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -605,7 +605,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
 	    if (ret2 != -1)
 		errbuf2 = errbuf;
 	    Data(ap, KRB_FORWARD_REJECT, errbuf, -1);
-	    log_message("Could not read forwarded credentials: %s", errbuf);
+	    log_message("Could not read forwarded credentials: %s", errbuf2);
 
 	    if (ret2 != -1)
 		free (errbuf);
diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
index 5a00e124c..13e2452bd 100644
--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -104,7 +104,6 @@ _gsskrb5_register_acceptor_identity(OM_uint32 *min_stat, const char *identity)
 void
 _gsskrb5i_is_cfx(krb5_context context, gsskrb5_ctx ctx, int acceptor)
 {
-    krb5_error_code ret;
     krb5_keyblock *key;
 
     if (acceptor) {
@@ -144,7 +143,8 @@ _gsskrb5i_is_cfx(krb5_context context, gsskrb5_ctx ctx, int acceptor)
     }
     if (ctx->crypto)
         krb5_crypto_destroy(context, ctx->crypto);
-    ret = krb5_crypto_init(context, key, 0, &ctx->crypto);
+    /* XXX We really shouldn't ignore this; will come back to this */
+    (void) krb5_crypto_init(context, key, 0, &ctx->crypto);
 }
 
 
diff --git a/lib/gssapi/mech/gss_acquire_cred_ext.c b/lib/gssapi/mech/gss_acquire_cred_ext.c
index 1cbb29f14..c38002f0a 100644
--- a/lib/gssapi/mech/gss_acquire_cred_ext.c
+++ b/lib/gssapi/mech/gss_acquire_cred_ext.c
@@ -152,7 +152,6 @@ _gss_acquire_cred_ext(OM_uint32 *minor_status,
     for (i = 0; i < mechs->count; i++) {
 	struct _gss_mechanism_name *mn = NULL;
 	struct _gss_mechanism_cred *mc = NULL;
-	gss_name_t desired_mech_name = GSS_C_NO_NAME;
 
 	m = __gss_get_mechanism(&mechs->elements[i]);
 	if (!m)
@@ -163,8 +162,6 @@ _gss_acquire_cred_ext(OM_uint32 *minor_status,
 					&mechs->elements[i], &mn);
 	    if (major_status != GSS_S_COMPLETE)
 		continue;
-
-	    desired_mech_name = mn->gmn_name;
 	}
 
 	major_status = _gss_acquire_mech_cred(minor_status, m, mn,
diff --git a/lib/gssapi/mech/gss_delete_sec_context.c b/lib/gssapi/mech/gss_delete_sec_context.c
index ce57a7668..69d9cb6a0 100644
--- a/lib/gssapi/mech/gss_delete_sec_context.c
+++ b/lib/gssapi/mech/gss_delete_sec_context.c
@@ -33,7 +33,7 @@ gss_delete_sec_context(OM_uint32 *minor_status,
     gss_ctx_id_t *context_handle,
     gss_buffer_t output_token)
 {
-	OM_uint32 major_status;
+	OM_uint32 major_status = GSS_S_COMPLETE;
 	struct _gss_context *ctx = (struct _gss_context *) *context_handle;
 
 	if (output_token)
@@ -53,5 +53,5 @@ gss_delete_sec_context(OM_uint32 *minor_status,
 		*context_handle = GSS_C_NO_CONTEXT;
 	}
 
-	return (GSS_S_COMPLETE);
+	return (major_status);
 }
diff --git a/lib/gssapi/test_common.c b/lib/gssapi/test_common.c
index 8251aef86..ebdcd7116 100644
--- a/lib/gssapi/test_common.c
+++ b/lib/gssapi/test_common.c
@@ -38,7 +38,7 @@
 char *
 gssapi_err(OM_uint32 maj_stat, OM_uint32 min_stat, gss_OID mech)
 {
-	OM_uint32 disp_min_stat, disp_maj_stat;
+	OM_uint32 disp_min_stat;
 	gss_buffer_desc maj_error_message;
 	gss_buffer_desc min_error_message;
 	OM_uint32 msg_ctx = 0;
@@ -50,12 +50,10 @@ gssapi_err(OM_uint32 maj_stat, OM_uint32 min_stat, gss_OID mech)
 	min_error_message.length = 0;
 	min_error_message.value = NULL;
 
-	disp_maj_stat = gss_display_status(&disp_min_stat, maj_stat,
-					   GSS_C_GSS_CODE,
-					   mech, &msg_ctx, &maj_error_message);
-	disp_maj_stat = gss_display_status(&disp_min_stat, min_stat,
-					   GSS_C_MECH_CODE,
-					   mech, &msg_ctx, &min_error_message);
+	(void) gss_display_status(&disp_min_stat, maj_stat, GSS_C_GSS_CODE,
+				  mech, &msg_ctx, &maj_error_message);
+	(void) gss_display_status(&disp_min_stat, min_stat, GSS_C_MECH_CODE,
+				  mech, &msg_ctx, &min_error_message);
 	if (asprintf(&ret, "gss-code: %lu %.*s -- mech-code: %lu %.*s",
 		     (unsigned long)maj_stat,
 		     (int)maj_error_message.length,
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 492bbadbd..ab3387c6b 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -770,10 +770,9 @@ main(int argc, char **argv)
     slave *slaves = NULL;
     uint32_t current_version = 0, old_version = 0;
     krb5_keytab keytab;
-    int optidx;
     char **files;
 
-    optidx = krb5_program_setup(&context, argc, argv, args, num_args, NULL);
+    (void) krb5_program_setup(&context, argc, argv, args, num_args, NULL);
 
     if(help_flag)
 	krb5_std_usage(0, args, num_args);
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index 38e9a7b71..f8c0761e6 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -191,13 +191,11 @@ receive_loop (krb5_context context,
      */
     do {
 	int32_t len, timestamp, tmp;
-	enum kadm_ops op;
 
 	if(krb5_ret_int32 (sp, &vers) != 0)
 	    return;
 	krb5_ret_int32 (sp, &timestamp);
 	krb5_ret_int32 (sp, &tmp);
-	op = tmp;
 	krb5_ret_int32 (sp, &len);
 	if ((uint32_t)vers <= server_context->log_context.version)
 	    krb5_storage_seek(sp, len + 8, SEEK_CUR);
diff --git a/lib/krb5/warn.c b/lib/krb5/warn.c
index cb3be76fc..34a2f726c 100644
--- a/lib/krb5/warn.c
+++ b/lib/krb5/warn.c
@@ -86,6 +86,12 @@ _warnerr(krb5_context context, int do_errtext,
     ret = _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); 		\
     va_end(ap);
 
+#define FUNC_NORET(ETEXT, CODE, LEVEL)					\
+    va_list ap;								\
+    va_start(ap, fmt);							\
+    (void) _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); 		\
+    va_end(ap);
+
 #undef __attribute__
 #define __attribute__(X)
 
@@ -202,7 +208,7 @@ krb5_err(krb5_context context, int eval, krb5_error_code code,
 	 const char *fmt, ...)
      __attribute__ ((noreturn, format (printf, 4, 5)))
 {
-    FUNC(1, code, 0);
+    FUNC_NORET(1, code, 0);
     exit(eval);
     UNREACHABLE(return 0);
 }
@@ -241,7 +247,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_errx(krb5_context context, int eval, const char *fmt, ...)
      __attribute__ ((noreturn, format (printf, 3, 4)))
 {
-    FUNC(0, 0, 0);
+    FUNC_NORET(0, 0, 0);
     exit(eval);
     UNREACHABLE(return 0);
 }
@@ -283,7 +289,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...)
      __attribute__ ((noreturn, format (printf, 3, 4)))
 {
-    FUNC(1, code, 0);
+    FUNC_NORET(1, code, 0);
     abort();
     UNREACHABLE(return 0);
 }
@@ -311,7 +317,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_abortx(krb5_context context, const char *fmt, ...)
      __attribute__ ((noreturn, format (printf, 2, 3)))
 {
-    FUNC(0, 0, 0);
+    FUNC_NORET(0, 0, 0);
     abort();
     UNREACHABLE(return 0);
 }
diff --git a/lib/ntlm/ntlm_err.et b/lib/ntlm/ntlm_err.et
index df062d059..79f44831c 100644
--- a/lib/ntlm/ntlm_err.et
+++ b/lib/ntlm/ntlm_err.et
@@ -14,7 +14,7 @@ error_code RAND,		"Random generator failed"
 error_code AUTH,		"NTLM authentication failed"
 error_code TIME_SKEW,		"Client time skewed to server"
 error_code OEM,			"Client set OEM string"
-error_code MISSING_NAME_SEPARATOR, "missing @ or \\ in name"
+error_code MISSING_NAME_SEPARATOR, "missing @ or \\\\ in name"
 error_code MISSING_BUFFER, 	"missing expected buffer"
 error_code INVALID_APOP, 	"Invalid APOP response"
 error_code INVALID_CRAM_MD5, 	"Invalid CRAM-MD5 response"