diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c
index 33743f706..04ab52cc9 100644
--- a/lib/gssapi/accept_sec_context.c
+++ b/lib/gssapi/accept_sec_context.c
@@ -212,7 +212,8 @@ gss_accept_sec_context
     ret = gssapi_krb5_decapsulate (minor_status,
 				   input_token_buffer,
 				   &indata,
-				   "\x01\x00");
+				   "\x01\x00",
+				   GSS_KRB5_MECHANISM);
     if (ret)
 	goto failure;
 
@@ -411,7 +412,8 @@ gss_accept_sec_context
 	ret = gssapi_krb5_encapsulate (minor_status,
 				       &outbuf,
 				       output_token,
-				       "\x02\x00");
+				       "\x02\x00",
+				       GSS_KRB5_MECHANISM);
 	krb5_data_free (&outbuf);
 	if (ret)
 	    goto failure;
@@ -425,7 +427,7 @@ gss_accept_sec_context
 #endif
 
     {
-	OM_uint32 seq_number;
+	int32_t seq_number;
 	
 	krb5_auth_getremoteseqnumber (gssapi_krb5_context,
 				      (*context_handle)->auth_context,
diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
index f46b90ab0..240b42db9 100644
--- a/lib/gssapi/init_sec_context.c
+++ b/lib/gssapi/init_sec_context.c
@@ -417,7 +417,7 @@ init_auth
     }
 
     ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token,
-				   "\x01\x00");
+				   "\x01\x00", GSS_KRB5_MECHANISM);
     if (ret)
 	goto failure;
 
@@ -497,7 +497,7 @@ repl_mutual
 	*actual_mech_type = GSS_KRB5_MECHANISM;
 
     ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata,
-				   "\x02\x00");
+				   "\x02\x00", GSS_KRB5_MECHANISM);
     if (ret) {
 	HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
 	/* XXX - Handle AP_ERROR */
diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
index 33743f706..04ab52cc9 100644
--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -212,7 +212,8 @@ gss_accept_sec_context
     ret = gssapi_krb5_decapsulate (minor_status,
 				   input_token_buffer,
 				   &indata,
-				   "\x01\x00");
+				   "\x01\x00",
+				   GSS_KRB5_MECHANISM);
     if (ret)
 	goto failure;
 
@@ -411,7 +412,8 @@ gss_accept_sec_context
 	ret = gssapi_krb5_encapsulate (minor_status,
 				       &outbuf,
 				       output_token,
-				       "\x02\x00");
+				       "\x02\x00",
+				       GSS_KRB5_MECHANISM);
 	krb5_data_free (&outbuf);
 	if (ret)
 	    goto failure;
@@ -425,7 +427,7 @@ gss_accept_sec_context
 #endif
 
     {
-	OM_uint32 seq_number;
+	int32_t seq_number;
 	
 	krb5_auth_getremoteseqnumber (gssapi_krb5_context,
 				      (*context_handle)->auth_context,
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index f46b90ab0..240b42db9 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -417,7 +417,7 @@ init_auth
     }
 
     ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token,
-				   "\x01\x00");
+				   "\x01\x00", GSS_KRB5_MECHANISM);
     if (ret)
 	goto failure;
 
@@ -497,7 +497,7 @@ repl_mutual
 	*actual_mech_type = GSS_KRB5_MECHANISM;
 
     ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata,
-				   "\x02\x00");
+				   "\x02\x00", GSS_KRB5_MECHANISM);
     if (ret) {
 	HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
 	/* XXX - Handle AP_ERROR */