diff --git a/include/eepp/network/socket.hpp b/include/eepp/network/socket.hpp
index 10eea4b34..e5a8257d4 100644
--- a/include/eepp/network/socket.hpp
+++ b/include/eepp/network/socket.hpp
@@ -4,7 +4,6 @@
 #include <eepp/core.hpp>
 #include <eepp/core/noncopyable.hpp>
 #include <eepp/network/sockethandle.hpp>
-#include <vector>
 
 namespace EE { namespace Network {
 class SocketSelector;
diff --git a/include/eepp/network/tcpsocket.hpp b/include/eepp/network/tcpsocket.hpp
index 17d7d1181..0f22776e7 100644
--- a/include/eepp/network/tcpsocket.hpp
+++ b/include/eepp/network/tcpsocket.hpp
@@ -118,11 +118,11 @@ class EE_API TcpSocket : public Socket {
 
 	/** Set the send timeout. Only callable after connect ( after the socket
 	 ** has been initialized ). */
-	void setSendTimeout( SocketHandle sock, const Time& timeout );
+	void setSendTimeout( const Time& timeout );
 
 	/** Set the receive timeout Only callable after connect ( after the socket
 	 ** has been initialized ). */
-	void setReceiveTimeout( SocketHandle sock, const Time& timeout );
+	void setReceiveTimeout( const Time& timeout );
 
 	typedef std::function<void( const char* bytes, size_t n )> ReadFn;
 
diff --git a/src/eepp/network/http.cpp b/src/eepp/network/http.cpp
index 7324d26b2..cea1dc334 100644
--- a/src/eepp/network/http.cpp
+++ b/src/eepp/network/http.cpp
@@ -746,6 +746,11 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr
 			connection->setSSL( isSSL );
 		}
 
+		if ( timeout != Time::Zero ) {
+			socket->setReceiveTimeout( timeout );
+			socket->setSendTimeout( timeout );
+		}
+
 		connection->setSocket( socket );
 
 		mConnection = connection;
diff --git a/src/eepp/network/tcpsocket.cpp b/src/eepp/network/tcpsocket.cpp
index cd2a3c3d7..9849c44ac 100644
--- a/src/eepp/network/tcpsocket.cpp
+++ b/src/eepp/network/tcpsocket.cpp
@@ -1,5 +1,3 @@
-#include <algorithm>
-#include <bitset>
 #include <cstring>
 #include <eepp/network/ipaddress.hpp>
 #include <eepp/network/packet.hpp>
@@ -333,13 +331,13 @@ Socket::Status TcpSocket::receive( Packet& packet ) {
 	return Done;
 }
 
-void TcpSocket::setSendTimeout( SocketHandle /*sock*/, const Time& timeout ) {
+void TcpSocket::setSendTimeout( const Time& timeout ) {
 	if ( getHandle() != Private::SocketImpl::invalidSocket() ) {
 		Private::SocketImpl::setSendTimeout( getHandle(), timeout );
 	}
 }
 
-void TcpSocket::setReceiveTimeout( SocketHandle /*sock*/, const Time& timeout ) {
+void TcpSocket::setReceiveTimeout( const Time& timeout ) {
 	if ( getHandle() != Private::SocketImpl::invalidSocket() ) {
 		Private::SocketImpl::setReceiveTimeout( getHandle(), timeout );
 	}
@@ -347,7 +345,7 @@ void TcpSocket::setReceiveTimeout( SocketHandle /*sock*/, const Time& timeout )
 
 void TcpSocket::startAsyncRead( ReadFn readFn ) {
 	mReadThread = std::thread( [this, readFn] {
-		setReceiveTimeout( mSocket, Milliseconds( 100 ) );
+		setReceiveTimeout( Milliseconds( 100 ) );
 		std::string buffer;
 		buffer.resize( 131072 );
 		Clock clock;
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index 62a0f8e75..6c0ddc285 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -533,7 +533,6 @@ void LSPClientPlugin::createListView( UICodeEditor* editor, const std::shared_pt
 		lv->addClass( "editor_listview" );
 		auto pos =
 			editor->getRelativeScreenPosition( editor->getDocumentRef()->getSelection().start() );
-		lv->setSelection( model->index( 0, 0 ) );
 		lv->setPixelsPosition( { pos.x, pos.y + editor->getLineHeight() } );
 		if ( !lv->getParent()->getLocalBounds().contains(
 				 lv->getLocalBounds().setPosition( lv->getPixelsPosition() ) ) ) {
@@ -554,6 +553,7 @@ void LSPClientPlugin::createListView( UICodeEditor* editor, const std::shared_pt
 						   ScrollBarMode::AlwaysOff );
 		if ( onCreateCb )
 			onCreateCb( lv );
+		lv->setSelection( model->index( 0 ) );
 		lv->setFocus();
 		Uint32 focusCb = lv->getUISceneNode()->getUIEventDispatcher()->addFocusEventCallback(
 			[lv]( const auto&, Node* focus, Node* ) {