diff --git a/reactos/drivers/lib/ip/network/address.c b/reactos/drivers/lib/ip/network/address.c
index 2d4c2b8e87b..1547a8b7f28 100644
--- a/reactos/drivers/lib/ip/network/address.c
+++ b/reactos/drivers/lib/ip/network/address.c
@@ -169,17 +169,17 @@ NTSTATUS AddrGetAddress(
  *     Status of operation
  */
 NTSTATUS AddrBuildAddress(
-    PTA_ADDRESS TdiAddress,
+    PTRANSPORT_ADDRESS TaAddress,
     PIP_ADDRESS *Address,
     PUSHORT Port)
 {
   PTDI_ADDRESS_IP ValidAddr;
+  PTA_ADDRESS TdiAddress = &TaAddress->Address[0];
   PIP_ADDRESS IPAddress;
 
   if (TdiAddress->AddressType != TDI_ADDRESS_TYPE_IP) {
       TI_DbgPrint
-	  (MID_TRACE,("AddressType %x, Not valid\n", 
-		      TdiAddress->AddressType));
+	  (MID_TRACE,("AddressType %x, Not valid\n", TdiAddress->AddressType));
     return STATUS_INVALID_ADDRESS;
   }
   if (TdiAddress->AddressLength < TDI_ADDRESS_LENGTH_IP) {
diff --git a/reactos/drivers/lib/ip/transport/tcp/tcp.c b/reactos/drivers/lib/ip/transport/tcp/tcp.c
index b053d9fdd66..b57dcd74ff0 100644
--- a/reactos/drivers/lib/ip/transport/tcp/tcp.c
+++ b/reactos/drivers/lib/ip/transport/tcp/tcp.c
@@ -259,7 +259,7 @@ NTSTATUS TCPConnect
     InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry );
 
     Status = AddrBuildAddress
-	((PTA_ADDRESS)ConnInfo->RemoteAddress,
+	((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress,
 	 &RemoteAddress,
 	 &RemotePort);
 
diff --git a/reactos/drivers/net/afd/afd/tdiconn.c b/reactos/drivers/net/afd/afd/tdiconn.c
index 5aef50bc23f..b25e83f1a59 100644
--- a/reactos/drivers/net/afd/afd/tdiconn.c
+++ b/reactos/drivers/net/afd/afd/tdiconn.c
@@ -1,4 +1,4 @@
-/* $Id: tdiconn.c,v 1.3 2004/10/03 20:36:45 arty Exp $
+/* $Id: tdiconn.c,v 1.4 2004/10/03 21:44:42 arty Exp $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/tdiconn.c
@@ -131,7 +131,7 @@ TdiBuildConnectionInfoInPlace
 ( PTDI_CONNECTION_INFORMATION ConnectionInfo,
   PTRANSPORT_ADDRESS Address ) {
     NTSTATUS Status = STATUS_SUCCESS;
-    
+
     RtlCopyMemory( ConnectionInfo->RemoteAddress,
 		   Address, 
 		   ConnectionInfo->RemoteAddressLength );
@@ -146,11 +146,11 @@ TdiBuildConnectionInfo
   PTRANSPORT_ADDRESS Address ) {
     NTSTATUS Status = TdiBuildNullConnectionInfo
 	( ConnectionInfo, Address->Address[0].AddressType );
-  
-  if( NT_SUCCESS(Status) )
-    TdiBuildConnectionInfoInPlace( *ConnectionInfo, Address );
-  
-  return Status;
+ 
+    if( NT_SUCCESS(Status) )
+	TdiBuildConnectionInfoInPlace( *ConnectionInfo, Address );
+
+    return Status;
 }
 
 NTSTATUS 
diff --git a/reactos/drivers/net/tcpip/include/address.h b/reactos/drivers/net/tcpip/include/address.h
index 87cca427482..f4e02b7249d 100644
--- a/reactos/drivers/net/tcpip/include/address.h
+++ b/reactos/drivers/net/tcpip/include/address.h
@@ -41,7 +41,7 @@ NTSTATUS AddrGetAddress(
     PUSHORT Port);
 
 NTSTATUS AddrBuildAddress(
-    PTA_ADDRESS TdiAddress,
+    PTRANSPORT_ADDRESS TdiAddress,
     PIP_ADDRESS *Address,
     PUSHORT Port);
 
diff --git a/reactos/drivers/net/tcpip/tcpip/main.c b/reactos/drivers/net/tcpip/tcpip/main.c
index 74c0f83fe98..4477bef5e8f 100644
--- a/reactos/drivers/net/tcpip/tcpip/main.c
+++ b/reactos/drivers/net/tcpip/tcpip/main.c
@@ -218,7 +218,6 @@ CP
 CP
     /* Open address file object */
 
-
     /* Protocol depends on device object so find the protocol */
     if (DeviceObject == TCPDeviceObject)
       Protocol = IPPROTO_TCP;