Index: libcio/filesys.c
===================================================================
--- libcio/filesys.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
+++ libcio/filesys.c	(revision 1efe224b2c7d783b5532c40f25af37958c236a60)
@@ -684,5 +684,5 @@
 		_dirin = FALSE;
 
-		if ((struct bpb *)0L EQ (_thebpb = BIOS(B_GBPB, 0))) {
+		if (NULL EQ (_thebpb = (struct bpb *)BIOS(B_GBPB, 0))) {
 
 			errno = EIO;	/* couldn't read the BPB */
Index: libcio/open.c
===================================================================
--- libcio/open.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
+++ libcio/open.c	(revision 1efe224b2c7d783b5532c40f25af37958c236a60)
@@ -19,8 +19,8 @@
 static struct devtabl devtabl[] = {
 
-	{ "con:", &condev,  2 },	/* console device */
-	{ "CON:", &condev,  2 },
-
-	{      0, &filedev, 0 }		/* this MUST be the last entry */
+	{ "con:", &condev,  (io_arg)2 },	/* console device */
+	{ "CON:", &condev,  (io_arg)2 },
+
+	{      0, &filedev,      NULL }		/* this MUST be the last entry */
 };