diff -Naurp rpm-4.2.1-orig/python/header-py.c rpm-4.2.1/python/header-py.c
--- rpm-4.2.1-orig/python/header-py.c	2006-08-12 17:07:07.000000000 -0600
+++ rpm-4.2.1/python/header-py.c	2006-08-12 17:10:11.000000000 -0600
@@ -434,7 +434,7 @@ static PyObject * hdr_subscript(hdrObjec
 	while (extensions->name) {
 	    if (extensions->type == HEADER_EXT_TAG
 		&& !xstrcasecmp(extensions->name + 7, str)) {
-		(const struct headerSprintfExtension *) ext = extensions;
+		ext = extensions;
 	    }
 	    extensions++;
 	}
diff -Naurp rpm-4.2.1-orig/python/rpmmodule.c rpm-4.2.1/python/rpmmodule.c
--- rpm-4.2.1-orig/python/rpmmodule.c	2006-08-12 17:07:07.000000000 -0600
+++ rpm-4.2.1/python/rpmmodule.c	2006-08-12 17:12:28.000000000 -0600
@@ -269,7 +269,7 @@ void initrpm(void)
 
     while (extensions->name) {
 	if (extensions->type == HEADER_EXT_TAG) {
-            (const struct headerSprintfExtension *) ext = extensions;
+            ext = extensions;
             PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
 	    Py_DECREF(o);
             PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));
diff -Naurp rpm-4.2.1-orig/python/rpmts-py.c rpm-4.2.1/python/rpmts-py.c
--- rpm-4.2.1-orig/python/rpmts-py.c	2006-08-12 17:07:07.000000000 -0600
+++ rpm-4.2.1/python/rpmts-py.c	2006-08-12 17:11:46.000000000 -0600
@@ -27,7 +27,7 @@
 
 /*@unchecked@*/
 /*@-shadow@*/
-static int _rpmts_debug = 0;
+extern int _rpmts_debug;
 /*@=shadow@*/
 
 /*@access alKey @*/