diff --git a/reactos/dll/directx/wine/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c
index 118bc51b394..a08c13e600d 100644
--- a/reactos/dll/directx/wine/dplayx/dplay.c
+++ b/reactos/dll/directx/wine/dplayx/dplay.c
@@ -4466,8 +4466,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface,
         const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags )
 {
     IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
-    FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags );
-    return DP_OK;
+    return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context,
+            flags );
 }
 
 static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,
diff --git a/reactos/dll/directx/wine/dplayx/dplobby.c b/reactos/dll/directx/wine/dplayx/dplobby.c
index dd59a3e1395..58536d87660 100644
--- a/reactos/dll/directx/wine/dplayx/dplobby.c
+++ b/reactos/dll/directx/wine/dplayx/dplobby.c
@@ -815,8 +815,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
 static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddressTypes( IDirectPlayLobby3 *iface,
         LPDPLENUMADDRESSTYPESCALLBACK enumaddrtypecb, REFGUID sp, void *context, DWORD flags )
 {
-  FIXME(":stub\n");
-  return DPERR_OUTOFMEMORY;
+    IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
+    return IDirectPlayLobby_EnumAddressTypes( &This->IDirectPlayLobby3A_iface, enumaddrtypecb, sp,
+          context, flags );
 }
 
 /********************************************************************
diff --git a/reactos/dll/directx/wine/dplayx/name_server.c b/reactos/dll/directx/wine/dplayx/name_server.c
index ffc80982760..2566c3699fd 100644
--- a/reactos/dll/directx/wine/dplayx/name_server.c
+++ b/reactos/dll/directx/wine/dplayx/name_server.c
@@ -147,7 +147,10 @@ LPVOID NS_GetNSAddr( LPVOID lpNSInfo )
    *        in place.
    */
 #if 1
-  return lpCache->first.lpQHFirst->lpNSAddrHdr;
+  if ( lpCache->first.lpQHFirst )
+    return lpCache->first.lpQHFirst->lpNSAddrHdr;
+
+  return NULL;
 #else
   /* FIXME: Should convert over to this */
   return lpCache->bNsIsLocal ? lpCache->lpLocalAddrHdr