diff --git a/Makefile b/Makefile
index 1dae134..2496f1c 100644
--- a/Makefile
+++ b/Makefile
@@ -85,8 +85,8 @@ ipxwrapper.dll: $(IPXWRAPPER_DEPS)
 ipxconfig.exe: src/ipxconfig.cpp icons/ipxconfig.o src/addr.o src/interface.o src/common.o src/config.o
 	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe $^ -liphlpapi -lcomctl32 -lws2_32
 
-dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o
-	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -lwsock32
+dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o src/config.o src/addr.o src/dpwsockx.def
+	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o $@ $^ -lwsock32
 
 src/ipxwrapper_stubs.s: src/ipxwrapper_stubs.txt
 	perl mkstubs.pl src/ipxwrapper_stubs.txt src/ipxwrapper_stubs.s 0
@@ -103,7 +103,7 @@ src/dpwsockx_stubs.s: src/dpwsockx_stubs.txt
 icons/%.o: icons/%.rc icons/%.ico
 	windres $< -O coff -o $@
 
-%.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/%.def
+%.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/config.o src/addr.o src/%.def
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o $@ $^
 
 src/%_stubs.o: src/%_stubs.s
diff --git a/src/directplay.c b/src/directplay.c
index 7d327fd..581b760 100644
--- a/src/directplay.c
+++ b/src/directplay.c
@@ -582,11 +582,7 @@ BOOL WINAPI DllMain(HINSTANCE me, DWORD why, LPVOID res) {
 	{
 		log_open("ipxwrapper.log");
 		
-		HKEY reg = reg_open_main(false);
-		
-		min_log_level = reg_get_dword(reg, "min_log_level", LOG_INFO);
-		
-		reg_close(reg);
+		min_log_level = get_main_config().log_level;
 	}
 	else if(why == DLL_PROCESS_DETACH)
 	{
diff --git a/src/mswsock_stubs.txt b/src/mswsock_stubs.txt
index 3bc0062..a0e474b 100644
--- a/src/mswsock_stubs.txt
+++ b/src/mswsock_stubs.txt
@@ -32,3 +32,4 @@ s_perror
 sethostname
 inet_addr
 WSHEnumProtocols:0
+ntohs:1
diff --git a/src/stubdll.c b/src/stubdll.c
index e75d18a..b7324d0 100644
--- a/src/stubdll.c
+++ b/src/stubdll.c
@@ -20,17 +20,14 @@
 #include <stdlib.h>
 
 #include "common.h"
+#include "config.h"
 
 BOOL WINAPI DllMain(HINSTANCE me, DWORD why, LPVOID res) {
 	if(why == DLL_PROCESS_ATTACH)
 	{
 		log_open("ipxwrapper.log");
 		
-		HKEY reg = reg_open_main(false);
-		
-		min_log_level = reg_get_dword(reg, "min_log_level", LOG_INFO);
-		
-		reg_close(reg);
+		min_log_level = get_main_config().log_level;
 	}
 	else if(why == DLL_PROCESS_DETACH)
 	{