diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp
index 542b7164c..612547fcb 100644
--- a/uppsrc/CtrlLib/ChWin32.cpp
+++ b/uppsrc/CtrlLib/ChWin32.cpp
@@ -653,8 +653,7 @@ void ChSysInit()
 		}
 	}
 
-	if(Ctrl::IsDarkThemeEnabled() && IsSystemThemeDark() && !IsDark(Color::FromCR(GetSysColor(COLOR_WINDOW))))
-		sEmulateDarkTheme = true;
+	sEmulateDarkTheme = Ctrl::IsDarkThemeEnabled() && IsSystemThemeDark() && !IsDark(Color::FromCR(GetSysColor(COLOR_WINDOW)));
 
 	CtrlImg::Reset();
 	CtrlsImg::Reset();
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index e43e42944..ba618ef7b 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -239,7 +239,7 @@ END_LAYOUT
 
 LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
 	ITEM(Label, dv___0, SetLabel(t_("Compiler name")).LeftPosZ(0, 104).TopPosZ(4, 19))
-	ITEM(EditString, compiler, LeftPosZ(132, 516).TopPosZ(4, 19))
+	ITEM(EditString, compiler, HSizePosZ(132, 0).TopPosZ(4, 19))
 	ITEM(Label, dv___2, SetLabel(t_("External debugger")).LeftPosZ(0, 100).TopPosZ(24, 19))
 	ITEM(EditString, debugger, HSizePosZ(132, 0).TopPosZ(24, 19))
 	ITEM(Label, dv___4, SetLabel(t_("Common options")).LeftPosZ(0, 112).TopPosZ(44, 19))