diff --git a/include/win32/setup.h b/include/win32/setup.h
index 2c33c4f52..545508307 100644
--- a/include/win32/setup.h
+++ b/include/win32/setup.h
@@ -50,7 +50,7 @@
 #define PERMDATADIR "data"
 #define CACHEDIR "cache"
 #define TMPDIR "tmp"
-#define PIDFILE PERMDATA"/unrealircd.pid"
+#define PIDFILE PERMDATADIR"/unrealircd.pid"
 #define NO_U_TYPES
 #define NEED_U_INT32_T
 #define PREFIX_AQ
diff --git a/src/ircd.c b/src/ircd.c
index 6602b0c21..300065d32 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -1351,7 +1351,7 @@ int InitwIRCD(int argc, char *argv[])
 
 	do_version_check();
 
-#ifndef	CHROOTDIR
+#if !defined(CHROOTDIR) && !defined(_WIN32)
 	if (chdir(CONFDIR)) {
 # ifndef _WIN32
 		perror("chdir");
diff --git a/src/win32/editor.c b/src/win32/editor.c
index 562503cd3..d55424a95 100644
--- a/src/win32/editor.c
+++ b/src/win32/editor.c
@@ -657,7 +657,7 @@ LRESULT CALLBACK FromFileDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
 					lpopen.lpstrFile = path;
 					lpopen.nMaxFile = MAX_PATH;
 					lpopen.lpstrFileTitle = NULL;
-					lpopen.lpstrInitialDir = CFGPATH;
+					lpopen.lpstrInitialDir = CONFDIR;
 					lpopen.lpstrTitle = NULL;
 					lpopen.Flags = (OFN_ENABLESIZING|OFN_NONETWORKBUTTON|
 							OFN_OVERWRITEPROMPT);