diff --git a/src/eepp/graphics/fontfamily.cpp b/src/eepp/graphics/fontfamily.cpp
index 333dee2e9..4a7288330 100644
--- a/src/eepp/graphics/fontfamily.cpp
+++ b/src/eepp/graphics/fontfamily.cpp
@@ -14,7 +14,7 @@ void FontFamily::loadFromRegular( FontTrueType* font, std::string overwriteFontN
 	std::string fontname( overwriteFontName.empty()
 							  ? FileSystem::fileRemoveExtension( font->getInfo().filename )
 							  : overwriteFontName );
-	if ( String::endsWith( fontname, "-Regular" ) ) {
+	if ( String::endsWith( fontname, "-Regular" ) || String::endsWith( fontname, "-regular" ) ) {
 		auto pos( fontname.find_last_of( '-' ) );
 		fontname.resize( pos );
 	}
diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index 32d385949..7bdcc63ef 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -319,7 +319,6 @@ void UICodeEditor::draw() {
 	}
 
 	for ( unsigned long i = lineRange.first; i <= lineRange.second; i++ ) {
-		Lock l( mDoc->getHighlighter()->getLinesMutex() );
 
 		Vector2f curScroll(
 			{ startScroll.x, static_cast<float>( startScroll.y + lineHeight * (double)i ) } );
@@ -327,7 +326,10 @@ void UICodeEditor::draw() {
 		for ( auto& plugin : mPlugins )
 			plugin->drawBeforeLineText( this, i, curScroll, charSize, lineHeight );
 
-		drawLineText( i, curScroll, charSize, lineHeight );
+		{
+			Lock l( mDoc->getHighlighter()->getLinesMutex() );
+			drawLineText( i, curScroll, charSize, lineHeight );
+		}
 
 		for ( auto& plugin : mPlugins )
 			plugin->drawAfterLineText( this, i, curScroll, charSize, lineHeight );
diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw
index a2a0e475c..bc4eac387 160000
--- a/src/thirdparty/efsw
+++ b/src/thirdparty/efsw
@@ -1 +1 @@
-Subproject commit a2a0e475ca283321a7af38ec042893ab55e1b053
+Subproject commit bc4eac387a09ed75a379a71e05b31f424d146c8a