Merge socat changes