diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 36223e9b..834acacd 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index 6d0b13d1..77aea90d 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index 83aec0e4..daa60a30 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -149,10 +149,12 @@ CS.RUN.OPENSKT	ldx #3
 				
 				ldy #Identifier
 				lda A2OSX.RANDOM16
+				sta SA.LOCAL+S.SOCKADDR.PORT
 				sta SA.REMOTE+S.SOCKADDR.PORT
 				sta (pData),y
 				iny
 				lda A2OSX.RANDOM16+1
+				sta SA.LOCAL+S.SOCKADDR.PORT+1
 				sta SA.REMOTE+S.SOCKADDR.PORT+1
 				sta (pData),y
 				
@@ -265,7 +267,7 @@ CS.DOEVENT		lda (pEvent)
 CS.Print.UNREACH
 				ldx #3
 				
-.1				>PUSHB SA.LOCAL+S.SOCKADDR.ADDR,x
+.1				>PUSHB SA.REMOTE+S.SOCKADDR.ADDR,x
 				dex
 				bpl .1
 				
@@ -326,7 +328,7 @@ CS.QUIT			>LDA.G hFrame
 .1				>LDA.G hSocket
 				beq .2
 
-				>SYSCALL fclose
+				>LIBCALL hLIBTCPIP,LIBTCPIP.Shutdown
 				
 .2				lda hLIBTCPIP
 				beq .8
diff --git a/LIB/LIBTCPIP.S.ICMP.txt b/LIB/LIBTCPIP.S.ICMP.txt
index 3a9afa0a..d02fbfc4 100644
--- a/LIB/LIBTCPIP.S.ICMP.txt
+++ b/LIB/LIBTCPIP.S.ICMP.txt
@@ -55,10 +55,10 @@ ICMP.IN.ECHOREP	jsr FRM.GetTargetSKT.RAW
 				
 				ldy #S.ICMP.IDENTIFIER
 				lda (ZPFrameInPtr),y
-				sta SKT.LOC.ADDR+S.SOCKADDR.PORT+1
+				sta SKT.LOC.ADDR+S.SOCKADDR.PORT
 				iny
 				lda (ZPFrameInPtr),y
-				sta SKT.LOC.ADDR+S.SOCKADDR.PORT
+				sta SKT.LOC.ADDR+S.SOCKADDR.PORT+1
 
 				jsr SKT.FindMatchingLocRem
 				bcs .9
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index f762e0a2..5f8fefbb 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -279,6 +279,9 @@ SKT.Accept		>SYSCALL GetMemPtr
 SKT.shutdown	>SYSCALL GetMemPtr
 				>STYA ZPPtrSKT
 
+				ldy #S.SOCKET.T
+				lda (ZPPtrSKT),y
+				
 				cmp #S.SOCKET.T.STREAM
 				beq .10					TCP
 				cmp #S.SOCKET.T.RAW+1