diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c
index 55b705813..b56463b99 100644
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -64,7 +64,7 @@
 #include	<dbDefs.h>
 #include	<db_access.h>
 #include	<dbCommon.h>
-#include	<taskParams.h>
+#include	<task_params.h>
 
 
 /* function declarations */
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index 4d0dae7db..0644e45af 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -182,7 +182,7 @@
 #include	<devSup.h>
 #include	<link.h>
 #include	<interruptEvent.h>
-#include	<taskParams.h>
+#include	<task_params.h>
 #include	<module_types.h>
 #include	<fast_lock.h>
 
@@ -925,7 +925,7 @@ register short		lists;
 	short		scan_type;
 	short		phase;
 	short		event;
-	register short	status;
+	long		status;
 
 	/* get the list on which this record belongs */
 	scan_type = precord->scan;
@@ -1595,7 +1595,7 @@ short		*pcard_number;
 	if((precord->dset == NULL) ||(precord->dset->get_ioint_info == NULL ))
 		return(S_dev_noDevSup);
 	status=(*precord->dset->get_ioint_info)
-		(paddr,pio_type,pcard_type,pcard_number);
+		(precord,pio_type,pcard_type,pcard_number);
 	return(status);
 }