diff --git a/core/Makefile b/core/Makefile
index ba9a5a4c0..fe11623d4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -79,13 +79,13 @@ test_emu_fido2: ## run fido2 device tests
 test_emu_click: ## run click tests
 	cd tests ; ./run_tests_click_emu.sh $(TESTOPTS)
 
-test_emu_ui:  # run ui integration tests
+test_emu_ui: ## run ui integration tests
 	cd tests ; ./run_tests_device_emu.sh --test_screen=test-hash -m "not skip_ui" $(TESTOPTS)
 
-test_emu_ui_hash:  # create hashes of ui integration test fixtures
+test_emu_ui_hash: ## create hashes of ui integration test fixtures
 	cd tests ; ./run_tests_device_emu.sh --test_screen=hash -m "not skip_ui" $(TESTOPTS)
 
-test_emu_ui_record:  # record a full set of new ui fixtures
+test_emu_ui_record: ## record a full set of new ui fixtures
 	cd tests ; ./run_tests_device_emu.sh --test_screen=record -m "not skip_ui" $(TESTOPTS)
 
 pylint: ## run pylint on application sources and tests
diff --git a/legacy/firmware/protob/messages-debug.options b/legacy/firmware/protob/messages-debug.options
index ed4de5452..a5b7a122c 100644
--- a/legacy/firmware/protob/messages-debug.options
+++ b/legacy/firmware/protob/messages-debug.options
@@ -15,8 +15,6 @@ DebugLinkMemory.memory                  max_size:1024
 DebugLinkMemoryWrite.memory             max_size:1024
 
 # unused fields
-DebugLinkState.layout_lines             max_count:10
-DebugLinkState.layout_lines             max_size:30
-DebugLinkLayout.lines                   max_count:10
-DebugLinkLayout.lines                   max_size:30
+DebugLinkState.layout_lines             max_count:10 max_size:30
+DebugLinkLayout.lines                   max_count:10 max_size:30
 DebugLinkRecordScreen.target_directory  max_size:16