diff --git a/src/eepp/ui/uiapplication.cpp b/src/eepp/ui/uiapplication.cpp
index 230ec33d2..0fe03f806 100644
--- a/src/eepp/ui/uiapplication.cpp
+++ b/src/eepp/ui/uiapplication.cpp
@@ -10,6 +10,8 @@
 #include <eepp/window/engine.hpp>
 #include <eepp/window/input.hpp>
 
+#include <iostream>
+
 using namespace EE::Graphics;
 using namespace EE::System;
 using namespace EE::Scene;
@@ -23,10 +25,17 @@ UIApplication::UIApplication( const WindowSettings& windowSettings, const Settin
 	displayManager->enableMouseFocusClickThrough();
 	displayManager->disableBypassCompositor();
 
+	if ( displayManager->getDisplayIndex( 0 ) == nullptr ) {
+		std::cerr << "Display not found, exiting" << std::endl;
+		return;
+	}
+
 	mWindow = Engine::instance()->createWindow( windowSettings, contextSettings );
 
-	if ( !mWindow->isOpen() )
+	if ( !mWindow->isOpen() ) {
+		std::cerr << "Could not create window, exiting" << std::endl;
 		return;
+	}
 
 	mDidRun = true;
 
diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp
index 7b9ba25f9..fdfb08904 100644
--- a/src/eepp/ui/uirichtext.cpp
+++ b/src/eepp/ui/uirichtext.cpp
@@ -2,6 +2,7 @@
 #include <eepp/graphics/primitives.hpp>
 #include <eepp/graphics/text.hpp>
 #include <eepp/scene/scenemanager.hpp>
+#include <eepp/system/scopedop.hpp>
 #include <eepp/ui/css/propertydefinition.hpp>
 #include <eepp/ui/uicodeeditor.hpp>
 #include <eepp/ui/uilayouter.hpp>
@@ -180,6 +181,9 @@ bool UIHTMLBody::applyProperty( const StyleSheetProperty& attribute ) {
 void UIHTMLBody::updateLayout() {
 	UIRichText::updateLayout();
 
+	if ( mStyle->getProperty( PropertyId::MinHeight ) )
+		return;
+
 	if ( mChild && mChild->isWidget() ) {
 		Float maxH = 0;
 		Node* child = mChild;
@@ -200,7 +204,7 @@ void UIHTMLBody::updateLayout() {
 			child = child->getNextNode();
 		}
 		if ( maxH > 0 ) {
-			Float dpH = PixelDensity::pxToDp( maxH );
+			Float dpH = std::trunc( PixelDensity::pxToDp( maxH ) );
 			if ( dpH != getMinSize().getHeight() )
 				setMinHeight( dpH );
 		}
diff --git a/src/examples/ui_html/ui_html.cpp b/src/examples/ui_html/ui_html.cpp
index 144dc3be3..75841b3f8 100644
--- a/src/examples/ui_html/ui_html.cpp
+++ b/src/examples/ui_html/ui_html.cpp
@@ -56,6 +56,9 @@ EE_MAIN_FUNC int main( int argc, char** argv ) {
 							   "Gecko) Chrome/148.0.0.0 Safari/537.36" );
 
 	auto win = app.getWindow();
+	if ( !win->isOpen() )
+		return EXIT_FAILURE;
+
 	auto ui = app.getUI();
 
 	FontTrueType* remixIconFont = FontTrueType::New( "icon", "assets/fonts/remixicon.ttf" );
diff --git a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
index 04e28f01e..1ff190cbc 100644
--- a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
+++ b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
@@ -885,41 +885,65 @@ AutoCompletePlugin::processSignatureHelp( const LSPSignatureHelp& signatureHelp
 	signatures.signatures.reserve( signatureHelp.signatures.size() );
 
 	TextDocument doc;
-	for ( const auto& sig : signatureHelp.signatures ) {
+
+	for ( size_t sigIdx = 0; sigIdx < signatureHelp.signatures.size(); sigIdx++ ) {
+		const auto& sig = signatureHelp.signatures[sigIdx];
+
 		String initialLabel( sig.label );
 		SignatureInformation nsig;
 		nsig.documentation = sig.documentation;
 
 		doc.reset();
 		doc.textInput( initialLabel );
+
 		std::vector<String> parameters;
-		parameters.reserve( sig.parameters.size() );
 		nsig.parameters.reserve( sig.parameters.size() );
 
-		int skippedSelections = 0;
+		if ( !mSignatureHelpMultiLine )
+			parameters.reserve( sig.parameters.size() );
+
+		Int32 skippedBeforeActiveParameter = 0;
+
 		for ( size_t i = 0; i < sig.parameters.size(); i++ ) {
-			auto start = String::utf8ToCodepointPosition( sig.label, sig.parameters[i].start );
-			auto end = String::utf8ToCodepointPosition( sig.label, sig.parameters[i].end );
+			const auto rawStart = sig.parameters[i].start;
+			const auto rawEnd = sig.parameters[i].end;
+
+			const bool isBeforeActiveParameter =
+				static_cast<Int32>( i ) < signatureHelp.activeParameter;
+
+			if ( rawStart < 0 || rawEnd < 0 || rawEnd < rawStart ||
+				 static_cast<size_t>( rawEnd ) > sig.label.size() ) {
+				if ( sigIdx == static_cast<size_t>( signatureHelp.activeSignature ) &&
+					 isBeforeActiveParameter ) {
+					skippedBeforeActiveParameter++;
+				}
+				continue;
+			}
+
+			auto start = String::utf8ToCodepointPosition( sig.label, rawStart );
+			auto end = String::utf8ToCodepointPosition( sig.label, rawEnd );
+
+			if ( start < 0 || end < 0 || end < start ) {
+				if ( sigIdx == static_cast<size_t>( signatureHelp.activeSignature ) &&
+					 isBeforeActiveParameter ) {
+					skippedBeforeActiveParameter++;
+				}
+				continue;
+			}
+
 			auto sel = TextRange::convertToLineColumn( initialLabel.view(), start, end );
 
 			nsig.parameters.emplace_back(
 				TextSelectionRange{ static_cast<Int64>( start ), static_cast<Int64>( end ) } );
 
-			size_t index = i - skippedSelections;
-
-			if ( i == 0 ) {
-				doc.setSelection( i, sel );
-			} else {
-				if ( !doc.addSelection( sel ).isValid() ) {
-					skippedSelections++;
-					continue;
-				}
-			}
-
-			parameters.emplace_back( doc.getSelectedText( index ) );
+			if ( !mSignatureHelpMultiLine )
+				parameters.emplace_back( doc.getText( sel ) );
 		}
 
-		auto selections( doc.getSelections() );
+		if ( sigIdx == static_cast<size_t>( signatureHelp.activeSignature ) ) {
+			signatures.activeParameter =
+				eemax<Int32>( 0, signatures.activeParameter - skippedBeforeActiveParameter );
+		}
 
 		if ( !mSignatureHelpMultiLine && 0 != doc.replaceAll( "\n", "" ) ) {
 			while ( 0 != doc.replaceAll( "  ", " " ) )
@@ -942,13 +966,35 @@ AutoCompletePlugin::processSignatureHelp( const LSPSignatureHelp& signatureHelp
 		signatures.signatures.emplace_back( std::move( nsig ) );
 	}
 
+	if ( signatures.signatures.empty() ) {
+		signatures.activeSignature = 0;
+		signatures.activeParameter = 0;
+	} else {
+		signatures.activeSignature =
+			eemin<Int32>( eemax<Int32>( signatures.activeSignature, 0 ),
+						  static_cast<Int32>( signatures.signatures.size() ) - 1 );
+
+		const auto& activeSig = signatures.signatures[signatures.activeSignature];
+
+		if ( activeSig.parameters.empty() ) {
+			signatures.activeParameter = 0;
+		} else {
+			signatures.activeParameter =
+				eemin<Int32>( eemax<Int32>( signatures.activeParameter, 0 ),
+							  static_cast<Int32>( activeSig.parameters.size() ) - 1 );
+		}
+	}
+
 	editor->runOnMainThread( [this, editor, signatures = std::move( signatures )] {
 		mSignatureHelpVisible = true;
 		mSignatureHelp = signatures;
+
 		if ( mSignatureHelpSelected >= static_cast<Int32>( mSignatureHelp.signatures.size() ) )
 			mSignatureHelpSelected = -1;
+
 		if ( mSignatureHelp.signatures.empty() )
 			resetSignatureHelp();
+
 		editor->invalidateDraw();
 	} );