Merge: Fix reading from Sockets