Fix SocketTimeout errors