diff --git a/builds/win32/msvc6/engine.dsp b/builds/win32/msvc6/engine.dsp
index 7f0f86ca3e..91f94aea11 100644
--- a/builds/win32/msvc6/engine.dsp
+++ b/builds/win32/msvc6/engine.dsp
@@ -426,7 +426,7 @@ SOURCE=..\..\..\src\jrd\vio.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\why.c
+SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/engine_classic.dsp b/builds/win32/msvc6/engine_classic.dsp
index 1ca4f3305f..0e1d9ae99d 100644
--- a/builds/win32/msvc6/engine_classic.dsp
+++ b/builds/win32/msvc6/engine_classic.dsp
@@ -426,7 +426,7 @@ SOURCE=..\..\..\src\jrd\vio.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\why.c
+SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/fbclient.dsp b/builds/win32/msvc6/fbclient.dsp
index 7b30d1fbc8..af9d1ecb60 100644
--- a/builds/win32/msvc6/fbclient.dsp
+++ b/builds/win32/msvc6/fbclient.dsp
@@ -180,7 +180,7 @@ SOURCE=..\..\..\src\jrd\utl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\why.c
+SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # End Group
 # Begin Group "DSQL files"
diff --git a/src/utilities/dba_full.epp b/src/utilities/dba_full.epp
index ad23688eda..4411b40ec5 100644
--- a/src/utilities/dba_full.epp
+++ b/src/utilities/dba_full.epp
@@ -53,7 +53,7 @@
 /* For Netware the follow DB handle and isc_status is #defined to be a  */
 /* local variable on the stack in main.  This is to avoid multiple      */
 /* threading problems with module level statics.                        */
-DATABASE DB = STATIC "/gds/dev_nt/utilities/yachts.lnk";
+DATABASE DB = STATIC "yachts.lnk";
 #define DB          db_handle
 #define isc_status  status_vector
 
diff --git a/src/utilities/gsec.cpp b/src/utilities/gsec.cpp
index 49257f561b..e83798f558 100644
--- a/src/utilities/gsec.cpp
+++ b/src/utilities/gsec.cpp
@@ -181,7 +181,7 @@ int UTIL_gsec(
  *
  **************************************/
 	STATUS *status;
-	void *db_handle = NULL;		/* user info database handle */
+	struct why_hndl *db_handle = NULL;		/* user info database handle */
 	TEXT user_info_name[MAXPATHLEN], *u;	/* user info database name */
 	SLONG redir_in, redir_out, redir_err;
 	int local_argc;
diff --git a/src/utilities/rmet.epp b/src/utilities/rmet.epp
index 55d7f96ab0..a3883858bb 100644
--- a/src/utilities/rmet.epp
+++ b/src/utilities/rmet.epp
@@ -31,7 +31,7 @@
 #include "../utilities/rmet_proto.h"
 #include "../jrd/gds_proto.h"
 
-DATABASE DB = STATIC FILENAME "rebuild.gdb";
+DATABASE DB = STATIC FILENAME "ODS.RDB";
 
 
 ULONG *RMET_tips(TEXT * db_in)
diff --git a/src/utilities/rstore.epp b/src/utilities/rstore.epp
index 64723d26c9..b889be6223 100644
--- a/src/utilities/rstore.epp
+++ b/src/utilities/rstore.epp
@@ -28,7 +28,7 @@
 #include "../utilities/rstor_proto.h"
 #include "../jrd/gds_proto.h"
 
-DATABASE DB = STATIC FILENAME "rebuild.gdb";
+DATABASE DB = STATIC FILENAME "ODS.RDB";
 
 static void store_headers(RBDB);
 
diff --git a/src/utilities/secur_proto.h b/src/utilities/secur_proto.h
index 1bd88ab399..4ea934e030 100644
--- a/src/utilities/secur_proto.h
+++ b/src/utilities/secur_proto.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-extern SSHORT	SECURITY_exec_line (STATUS *, void *, 
+extern SSHORT	SECURITY_exec_line (STATUS *, struct why_hndl *, 
 			struct user_data *, 
 			void (*)(void *, USER_DATA, BOOLEAN),
 			void *);
diff --git a/src/utilities/security.epp b/src/utilities/security.epp
index c0f53b7cc8..cd84520eef 100644
--- a/src/utilities/security.epp
+++ b/src/utilities/security.epp
@@ -34,16 +34,14 @@
 #include "../utilities/gsec.h"
 #include "../utilities/secur_proto.h"
 
-/* DATABASE DB = STATIC FILENAME "isc.gdb"; */
-
-DATABASE DB = STATIC FILENAME "isc4.gdb";
+DATABASE DB = STATIC FILENAME "isc.gdb";
 
 #define MAX_PASSWORD_LENGTH	31
 #define SYSDBA_USER_NAME	"SYSDBA"
 
 
 SSHORT SECURITY_exec_line(STATUS * isc_status,
-						  void *DB,
+						  FRBRD *DB,
 						  USER_DATA user_data,
 						  void (*display_func) (void *, USER_DATA, BOOLEAN),
 						  void *callback_arg)
@@ -111,7 +109,7 @@ SSHORT SECURITY_exec_line(STATUS * isc_status,
 	SCHAR encrypted1[MAX_PASSWORD_LENGTH + 2];
 	SCHAR encrypted2[MAX_PASSWORD_LENGTH + 2];
 	STATUS tmp_status[ISC_STATUS_LENGTH];
-	void *gds__trans;
+	FRBRD *gds__trans;
 	BOOLEAN found;
 	SSHORT ret = 0;