diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index 62b58b9d4..315ba62a0 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -42,7 +42,7 @@
 RCSID("$Id$");
 
 struct checksum_type {
-    int type;
+    krb5_cksumtype type;
     size_t blocksize;
     size_t checksumsize;
     krb5_keytype keytype;
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index caf56d61f..0f32198b6 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -104,7 +104,7 @@ krb5_init_context(krb5_context *context)
 		if(krb5_string_to_etype(p, etypes[j], &p->etypes[k]) == 0)
 		    k++;
 	    }
-	    p->etypes[k] = 0;
+	    p->etypes[k] = ETYPE_NULL;
 	    krb5_config_free_strings(etypes);
 	}
     }
@@ -156,7 +156,7 @@ default_etypes(krb5_enctype **etype)
 	ETYPE_DES_CBC_MD5,
 	ETYPE_DES_CBC_MD4,
 	ETYPE_DES_CBC_CRC,
-	0
+	ETYPE_NULL
     };
     *etype = malloc(sizeof(p));
     if(*etype == NULL)