diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.5/src/genbools.c
--- nsalibsepol/src/genbools.c	2005-03-29 21:55:26.000000000 -0500
+++ libsepol-1.5.5/src/genbools.c	2005-04-25 15:25:55.000000000 -0400
@@ -195,7 +195,7 @@
 	}
 
 	if (evaluate_conds(&policydb) < 0) {
-		__sepol_debug_printf("%s:  Error while re-evaluating conditionals: %s\n",
+		__sepol_debug_printf("%s: Error while re-evaluating conditionals\n",
 				     __FUNCTION__);
 		errno = EINVAL;
 		goto err;
diff --exclude-from=exclude -N -u -r nsalibsepol/src/hierarchy.c libsepol-1.5.5/src/hierarchy.c
--- nsalibsepol/src/hierarchy.c	2005-04-14 08:28:00.000000000 -0400
+++ libsepol-1.5.5/src/hierarchy.c	2005-04-25 15:21:51.000000000 -0400
@@ -269,7 +269,7 @@
 	char *parent;
 	hierarchy_args_t *a;
 	role_datum_t *r, *rp;
-	ebitmap_t *eb;
+	ebitmap_t *eb=NULL;
 
 	a = (hierarchy_args_t *)args;
 	r = (role_datum_t *)d;