diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c
index 1ccc21400..7c5403bd3 100644
--- a/lib/gssapi/mech/gss_mech_switch.c
+++ b/lib/gssapi/mech/gss_mech_switch.c
@@ -50,6 +50,9 @@ _gss_string_to_oid(const char* s, gss_OID oid)
 	const char		*p, *q;
 	char			*res;
 
+	oid->length = 0;
+	oid->elements = NULL;
+
 	/*
 	 * First figure out how many numbers in the oid, then
 	 * calculate the compiled oid size.
diff --git a/lib/gssapi/mech/gss_oid_to_str.c b/lib/gssapi/mech/gss_oid_to_str.c
index f30a8ba00..d0d816930 100644
--- a/lib/gssapi/mech/gss_oid_to_str.c
+++ b/lib/gssapi/mech/gss_oid_to_str.c
@@ -42,8 +42,7 @@ gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str)
     heim_oid o;
     char *p;
 
-    oid_str->value = NULL;
-    oid_str->length = 0;
+    _mg_buffer_zero(oid_str);
 
     ret = der_get_oid (oid->elements, oid->length, &o, &size);
     if (ret) {
diff --git a/lib/gssapi/mech/gss_release_cred.c b/lib/gssapi/mech/gss_release_cred.c
index 57f3c862e..508aa22ba 100644
--- a/lib/gssapi/mech/gss_release_cred.c
+++ b/lib/gssapi/mech/gss_release_cred.c
@@ -47,6 +47,6 @@ gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
 	free(cred);
 
 	*minor_status = 0;
-	*cred_handle = 0;
+	*cred_handle = GSS_C_NO_CREDENTIAL;
 	return (GSS_S_COMPLETE);
 }
diff --git a/lib/gssapi/mech/gss_release_oid_set.c b/lib/gssapi/mech/gss_release_oid_set.c
index 117670bbf..b08c70e85 100644
--- a/lib/gssapi/mech/gss_release_oid_set.c
+++ b/lib/gssapi/mech/gss_release_oid_set.c
@@ -39,7 +39,7 @@ gss_release_oid_set(OM_uint32 *minor_status,
 		if ((*set)->elements)
 			free((*set)->elements);
 		free(*set);
-		*set = 0;
+		*set = GSS_C_NO_OID_SET;
 	}
 	return (GSS_S_COMPLETE);
 }