diff --git a/src/drv/drvEpvxi.c b/src/drv/drvEpvxi.c
index d9180ee4e..7cff7d804 100644
--- a/src/drv/drvEpvxi.c
+++ b/src/drv/drvEpvxi.c
@@ -155,8 +155,11 @@ static char *sccsId = "$Id$\t$Date$";
 #include <intLib.h>
 #include <tickLib.h>
 #include <stdioLib.h>
+#if 0
 #include <string.h>
+#endif
 
+#include <devLib.h>
 #define SRCepvxiLib	/* allocate externals here */
 #include <drvEpvxi.h>
 #include <drvHp1404a.h>
@@ -830,7 +833,9 @@ enum laPass	pass
 		 * This makes the MXI/VXI configure correctly after
 		 * a control x (soft) reboot.
 		 */
-		vxi_unmap_mxi_devices();
+		if(pass == laPassSC){
+			vxi_unmap_mxi_devices();
+		}
 
 		/*
 		 * for each MXI found that we have not seen before
@@ -1021,6 +1026,17 @@ enum laPass	pass
 		pmxi_new->dir.w.dd.mxi.la_window =
 			1 | (1<<NVXIADDRBITS);
 
+/*
+ * Makes NI MXI hardware bug go away?
+ */
+#if 0
+{
+	int16_t		tmp;
+
+	tmp = pmxi_new->dir.w.dd.mxi.la_window;
+	tmp = pmxi_new->dir.w.dd.mxi.control; 
+}
+#endif
 		mxi_map(pnewvxie, pass);	
 		
 		/*
@@ -1129,7 +1145,7 @@ unsigned	la
 				sizeof(id),
 				(char *)&id);
   	if(status<0){
-		return S_epvxi_internal;
+		return S_dev_noDevice;
 	}
 
 	status = verify_valid_window(pvxie, la);
@@ -1190,6 +1206,10 @@ unsigned	la
 		}
 	}
 
+#	ifdef DEBUG
+		printf("Found LA=0X%X extender LA=0X%X\n", la, pvxie->la);
+#	endif
+
 	return VXI_SUCCESS;
 }
 
@@ -1325,6 +1345,12 @@ LOCAL void vxi_record_topology(void)
 			}
 		}
 		else{
+			errPrintf(
+				status,
+				__FILE__,
+				__LINE__,
+				"LA=0X%X",
+				la);
 			(*pplac)->slot = UKN_SLOT;
 			(*pplac)->slot_zero_la = UKN_LA;
 			(*pplac)->extender_la = UKN_LA;
@@ -1956,8 +1982,14 @@ VXISZ			**ppvxisz
 	EPVXISTAT	status;
 	unsigned char	slot;
 
-	status = S_epvxi_internal;
+	/*
+	 * RULE C.2.7
+	 */
+	if(VXIMODIDSTATUS(pcsr->dir.r.status)){
+		return S_epvxi_noMODID;
+	}
 
+	status = S_epvxi_slotNotFound;
 	pvxisz = (VXISZ *) crateList.node.next;
 	while(pvxisz){
 
diff --git a/src/libCom/bucketLib.c b/src/libCom/bucketLib.c
index 080af4262..2aaccc9bc 100644
--- a/src/libCom/bucketLib.c
+++ b/src/libCom/bucketLib.c
@@ -51,11 +51,6 @@
 #define BUCKET_IX_N		(1<<BUCKET_IX_WIDTH)
 #define BUCKET_IX_MASK		(BUCKET_IX_N-1)	
 
-typedef union itemPtr{
-	void	*pItem;
-	BUCKET	*pBucket;
-}ITEMPTR;
-
 #ifdef DEBUG
 main()
 {
@@ -141,7 +136,12 @@ main()
 /*
  * bucketCreate()
  */
+#ifdef __STDC__
 BUCKET	*bucketCreate(unsigned indexWidth)
+#else 
+BUCKET	*bucketCreate(indexWidth)
+unsigned indexWidth;
+#endif
 {
 	BUCKET		*pb;
 	unsigned	nentries;
@@ -179,7 +179,14 @@ BUCKET	*bucketCreate(unsigned indexWidth)
 /*
  * bucketAddItem()
  */
+#ifdef __STDC__
 int	bucketAddItem(BUCKET *prb, BUCKETID id, void *pItem)
+#else
+int	bucketAddItem(prb, id, pItem)
+BUCKET  *prb;
+BUCKETID id;
+void *pItem;
+#endif
 {
 	ITEMPTR	*pi;
 
@@ -226,7 +233,14 @@ int	bucketAddItem(BUCKET *prb, BUCKETID id, void *pItem)
 /*
  * bucketRemoveItem()
  */
-int	bucketRemoveItem(BUCKET *prb, BUCKETID id, void *pItem)
+#ifdef __STDC__
+int	bucketRemoveItem (BUCKET *prb, BUCKETID id, void *pItem)
+#else
+int	bucketRemoveItem (prb, id, pItem)
+BUCKET *prb; 
+BUCKETID id; 
+void *pItem;
+#endif
 {
 	ITEMPTR	*ppi;
 
@@ -280,7 +294,13 @@ int	bucketRemoveItem(BUCKET *prb, BUCKETID id, void *pItem)
 /*
  * bucketLookupItem()
  */
+#ifdef __STDC__
 void	*bucketLookupItem(BUCKET *pb, BUCKETID id)
+#else
+void	*bucketLookupItem(pb, id)
+BUCKET *pb; 
+BUCKETID id;
+#endif
 {
 	unsigned shift;
 
@@ -311,7 +331,12 @@ void	*bucketLookupItem(BUCKET *pb, BUCKETID id)
 /*
  * bucketShow()
  */
+#ifdef __STDC__
 int	bucketShow(BUCKET *pb)
+#else
+int	bucketShow(pb)
+BUCKET *pb;
+#endif
 {
 	ITEMPTR	*pi;
 
diff --git a/src/libCom/bucketLib/bucketLib.c b/src/libCom/bucketLib/bucketLib.c
index 080af4262..2aaccc9bc 100644
--- a/src/libCom/bucketLib/bucketLib.c
+++ b/src/libCom/bucketLib/bucketLib.c
@@ -51,11 +51,6 @@
 #define BUCKET_IX_N		(1<<BUCKET_IX_WIDTH)
 #define BUCKET_IX_MASK		(BUCKET_IX_N-1)	
 
-typedef union itemPtr{
-	void	*pItem;
-	BUCKET	*pBucket;
-}ITEMPTR;
-
 #ifdef DEBUG
 main()
 {
@@ -141,7 +136,12 @@ main()
 /*
  * bucketCreate()
  */
+#ifdef __STDC__
 BUCKET	*bucketCreate(unsigned indexWidth)
+#else 
+BUCKET	*bucketCreate(indexWidth)
+unsigned indexWidth;
+#endif
 {
 	BUCKET		*pb;
 	unsigned	nentries;
@@ -179,7 +179,14 @@ BUCKET	*bucketCreate(unsigned indexWidth)
 /*
  * bucketAddItem()
  */
+#ifdef __STDC__
 int	bucketAddItem(BUCKET *prb, BUCKETID id, void *pItem)
+#else
+int	bucketAddItem(prb, id, pItem)
+BUCKET  *prb;
+BUCKETID id;
+void *pItem;
+#endif
 {
 	ITEMPTR	*pi;
 
@@ -226,7 +233,14 @@ int	bucketAddItem(BUCKET *prb, BUCKETID id, void *pItem)
 /*
  * bucketRemoveItem()
  */
-int	bucketRemoveItem(BUCKET *prb, BUCKETID id, void *pItem)
+#ifdef __STDC__
+int	bucketRemoveItem (BUCKET *prb, BUCKETID id, void *pItem)
+#else
+int	bucketRemoveItem (prb, id, pItem)
+BUCKET *prb; 
+BUCKETID id; 
+void *pItem;
+#endif
 {
 	ITEMPTR	*ppi;
 
@@ -280,7 +294,13 @@ int	bucketRemoveItem(BUCKET *prb, BUCKETID id, void *pItem)
 /*
  * bucketLookupItem()
  */
+#ifdef __STDC__
 void	*bucketLookupItem(BUCKET *pb, BUCKETID id)
+#else
+void	*bucketLookupItem(pb, id)
+BUCKET *pb; 
+BUCKETID id;
+#endif
 {
 	unsigned shift;
 
@@ -311,7 +331,12 @@ void	*bucketLookupItem(BUCKET *pb, BUCKETID id)
 /*
  * bucketShow()
  */
+#ifdef __STDC__
 int	bucketShow(BUCKET *pb)
+#else
+int	bucketShow(pb)
+BUCKET *pb;
+#endif
 {
 	ITEMPTR	*pi;