diff --git a/src/86box.c b/src/86box.c
index fbccb4b79..a30ff970f 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -259,7 +259,7 @@ struct accelKey def_acc_keys[NUM_ACCELS] = {
 		.seq="Ctrl+Alt+M" }
 };
 
-char vmm_path[1024] = { '\0'}; /* TEMPORARY - VM manager path to scan for VMs */
+char vmm_path[1024] = { '\0' }; /* VM manager path to scan for VMs */
 int  start_vmm = 1;
 
 /* Statistics. */
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index bde3dc2b5..175b5b302 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -194,7 +194,7 @@ extern char cfg_path[1024];     /* full path of config file */
 extern char global_cfg_path[1024]; /* full path of global config file */
 extern int  open_dir_usr_path;  /* default file open dialog directory of usr_path */
 extern char uuid[MAX_UUID_LEN]; /* UUID or machine identifier */
-extern char vmm_path[1024];       /* VM Manager path to scan (temporary) */
+extern char vmm_path[1024];       /* VM Manager path to scan */
 extern int  start_vmm;
 #ifndef USE_NEW_DYNAREC
 extern FILE *stdlog; /* file to log output to */
diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot
index bea183ff1..38b8811be 100644
--- a/src/qt/languages/86box.pot
+++ b/src/qt/languages/86box.pot
@@ -774,10 +774,10 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-msgid "Serial ports"
+msgid "Serial ports:"
 msgstr ""
 
-msgid "Parallel ports"
+msgid "Parallel ports:"
 msgstr ""
 
 msgid "Storage controllers"
@@ -2829,13 +2829,10 @@ msgstr ""
 msgid "Hostname:"
 msgstr ""
 
-msgid "ISA RTC"
+msgid "ISA RAM:"
 msgstr ""
 
-msgid "ISA RAM"
-msgstr ""
-
-msgid "ISA ROM"
+msgid "ISA ROM:"
 msgstr ""
 
 msgid "&Wipe NVRAM"
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 12fbccb5b..bd4860377 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -774,11 +774,11 @@ msgstr "COM a LPT porty"
 msgid "Ports"
 msgstr "Porty"
 
-msgid "Serial ports"
-msgstr "Sériové porty"
+msgid "Serial ports:"
+msgstr "Sériové porty:"
 
-msgid "Parallel ports"
-msgstr "Paralelní porty"
+msgid "Parallel ports:"
+msgstr "Paralelní porty:"
 
 msgid "Storage controllers"
 msgstr "Řadiče úložiště"
@@ -2829,14 +2829,11 @@ msgstr "Režim hubu"
 msgid "Hostname:"
 msgstr "Hostitelské jméno"
 
-msgid "ISA RTC"
-msgstr "ISA hodiny"
+msgid "ISA RAM:"
+msgstr "ISA paměť RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA paměť RAM"
-
-msgid "ISA ROM"
-msgstr "ISA paměť ROM"
+msgid "ISA ROM:"
+msgstr "ISA paměť ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Vymazat NVRAM"
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index cda7a2c5c..d784ebd1c 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -774,11 +774,11 @@ msgstr "Anschlüsse (COM + LPT)"
 msgid "Ports"
 msgstr "Anschlüsse"
 
-msgid "Serial ports"
-msgstr "Serielle Anschlüsse"
+msgid "Serial ports:"
+msgstr "Serielle Anschlüsse:"
 
-msgid "Parallel ports"
-msgstr "Parallele Anschlüsse"
+msgid "Parallel ports:"
+msgstr "Parallele Anschlüsse:"
 
 msgid "Storage controllers"
 msgstr "Speichercontroller"
@@ -2829,13 +2829,10 @@ msgstr "Hub-Modus"
 msgid "Hostname:"
 msgstr "Hostname:"
 
-msgid "ISA RTC"
+msgid "ISA RAM:"
 msgstr ""
 
-msgid "ISA RAM"
-msgstr ""
-
-msgid "ISA ROM"
+msgid "ISA ROM:"
 msgstr ""
 
 msgid "&Wipe NVRAM"
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index 86cc4bb4a..d9fbc4c2c 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -774,11 +774,11 @@ msgstr "Puertos (COM y LPT)"
 msgid "Ports"
 msgstr "Puertos"
 
-msgid "Serial ports"
-msgstr "Puertos serie"
+msgid "Serial ports:"
+msgstr "Puertos serie:"
 
-msgid "Parallel ports"
-msgstr "Puertos paralelos"
+msgid "Parallel ports:"
+msgstr "Puertos paralelos:"
 
 msgid "Storage controllers"
 msgstr "Controladoras de Almacenamiento"
@@ -2829,14 +2829,11 @@ msgstr "Modo de concentrador"
 msgid "Hostname:"
 msgstr "Nombre de host:"
 
-msgid "ISA RTC"
-msgstr "RTC ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Limpiar el NVRAM"
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 6e9d5b8e2..1c70d2d5f 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -774,11 +774,11 @@ msgstr "Ports (COM et LPT)"
 msgid "Ports"
 msgstr "Ports"
 
-msgid "Serial ports"
-msgstr "Ports série"
+msgid "Serial ports:"
+msgstr "Ports série:"
 
-msgid "Parallel ports"
-msgstr "Ports parallèles"
+msgid "Parallel ports:"
+msgstr "Ports parallèles:"
 
 msgid "Storage controllers"
 msgstr "Contrôleurs de stockage"
@@ -2829,14 +2829,11 @@ msgstr "Mode concentrateur"
 msgid "Hostname:"
 msgstr "Nom d'hôte:"
 
-msgid "ISA RTC"
-msgstr "RTC ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Effacer la mémoire NVRAM"
diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po
index 15c21412e..f903f596f 100644
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -774,11 +774,11 @@ msgstr "Vrata (COM & LPT)"
 msgid "Ports"
 msgstr "Vrata"
 
-msgid "Serial ports"
-msgstr "Serijska vrata"
+msgid "Serial ports:"
+msgstr "Serijska vrata:"
 
-msgid "Parallel ports"
-msgstr "Paralelna vrata"
+msgid "Parallel ports:"
+msgstr "Paralelna vrata:"
 
 msgid "Storage controllers"
 msgstr "Kontroleri za diskove"
@@ -2829,14 +2829,11 @@ msgstr "Način čvorišta"
 msgid "Hostname:"
 msgstr "Naziv hosta:"
 
-msgid "ISA RTC"
-msgstr "Sat u stvarnom vremenu ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Obriši NVRAM"
diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po
index 1fc12df31..07c417142 100644
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -774,11 +774,11 @@ msgstr "Porte (COM e LPT)"
 msgid "Ports"
 msgstr "Porte"
 
-msgid "Serial ports"
-msgstr "Porte seriali"
+msgid "Serial ports:"
+msgstr "Porte seriali:"
 
-msgid "Parallel ports"
-msgstr "Porte parallele"
+msgid "Parallel ports:"
+msgstr "Porte parallele:"
 
 msgid "Storage controllers"
 msgstr "Controller di archiviazione"
@@ -2829,14 +2829,11 @@ msgstr "Modalità Hub"
 msgid "Hostname:"
 msgstr "Nome host:"
 
-msgid "ISA RTC"
-msgstr "RTC ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Cancella NVRAM"
diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po
index 6e6aebfbd..ddc6db0e2 100644
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -774,11 +774,11 @@ msgstr "ポート (COM/LPT)"
 msgid "Ports"
 msgstr "ポート"
 
-msgid "Serial ports"
-msgstr "シリアルポート"
+msgid "Serial ports:"
+msgstr "シリアルポート:"
 
-msgid "Parallel ports"
-msgstr "パラレルポート"
+msgid "Parallel ports:"
+msgstr "パラレルポート:"
 
 msgid "Storage controllers"
 msgstr "ストレージコントローラ"
@@ -2829,14 +2829,11 @@ msgstr "ハブモード"
 msgid "Hostname:"
 msgstr "ホスト名:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "NVRAMを消去する(&W)"
diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po
index 0eadfc990..15a35d64d 100644
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -774,10 +774,10 @@ msgstr "포트 (COM & LPT)"
 msgid "Ports"
 msgstr ""
 
-msgid "Serial ports"
+msgid "Serial ports:"
 msgstr ""
 
-msgid "Parallel ports"
+msgid "Parallel ports:"
 msgstr ""
 
 msgid "Storage controllers"
@@ -2829,13 +2829,10 @@ msgstr ""
 msgid "Hostname:"
 msgstr ""
 
-msgid "ISA RTC"
+msgid "ISA RAM:"
 msgstr ""
 
-msgid "ISA RAM"
-msgstr ""
-
-msgid "ISA ROM"
+msgid "ISA ROM:"
 msgstr ""
 
 msgid "&Wipe NVRAM"
diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po
index a763ea839..c6e1c61ec 100644
--- a/src/qt/languages/nl-NL.po
+++ b/src/qt/languages/nl-NL.po
@@ -774,11 +774,11 @@ msgstr "Poorten (COM & LPT)"
 msgid "Ports"
 msgstr "Poorten"
 
-msgid "Serial ports"
-msgstr "Seriële poorten"
+msgid "Serial ports:"
+msgstr "Seriële poorten:"
 
-msgid "Parallel ports"
-msgstr "Parallelle poorten"
+msgid "Parallel ports:"
+msgstr "Parallelle poorten:"
 
 msgid "Storage controllers"
 msgstr "Opslagcontrollers"
@@ -2829,14 +2829,11 @@ msgstr "Hub-modus"
 msgid "Hostname:"
 msgstr "Hostname"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "NVRAM &wissen"
diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po
index d645acce5..a71c66775 100644
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -774,11 +774,11 @@ msgstr "Porty (COM & LPT)"
 msgid "Ports"
 msgstr "Porty"
 
-msgid "Serial ports"
-msgstr "Porty szeregowe"
+msgid "Serial ports:"
+msgstr "Porty szeregowe:"
 
-msgid "Parallel ports"
-msgstr "Porty równoległe"
+msgid "Parallel ports:"
+msgstr "Porty równoległe:"
 
 msgid "Storage controllers"
 msgstr "Kontrolery pamięci masowej"
@@ -2829,14 +2829,11 @@ msgstr "Tryb hub"
 msgid "Hostname:"
 msgstr "Nazwa komputera:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Wyczyść NVRAM"
diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po
index bc63005c1..fc65088cf 100644
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -774,11 +774,11 @@ msgstr "Portas (COM & LPT)"
 msgid "Ports"
 msgstr "Portas"
 
-msgid "Serial ports"
-msgstr "Portas seriais"
+msgid "Serial ports:"
+msgstr "Portas seriais:"
 
-msgid "Parallel ports"
-msgstr "Portas Paralelas"
+msgid "Parallel ports:"
+msgstr "Portas Paralelas:"
 
 msgid "Storage controllers"
 msgstr "Controladores de armaz."
@@ -2829,14 +2829,11 @@ msgstr "Modo Hub"
 msgid "Hostname:"
 msgstr "Nome do Host:"
 
-msgid "ISA RTC"
-msgstr "RTC ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Limpar NVRAM"
diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po
index 2a09a276f..89fef3760 100644
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -774,11 +774,11 @@ msgstr "Portas (COM e LPT)"
 msgid "Ports"
 msgstr "Portas"
 
-msgid "Serial ports"
-msgstr "Portas série"
+msgid "Serial ports:"
+msgstr "Portas série:"
 
-msgid "Parallel ports"
-msgstr "Portas paralelas"
+msgid "Parallel ports:"
+msgstr "Portas paralelas:"
 
 msgid "Storage controllers"
 msgstr "Dispositivos de armazenamento"
@@ -2829,14 +2829,11 @@ msgstr "Modo de concentrador"
 msgid "Hostname:"
 msgstr "Nome de anfitrião:"
 
-msgid "ISA RTC"
-msgstr "RTC ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Limpar a NVRAM"
diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po
index 1a27fbe8a..005b58d9c 100644
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -774,11 +774,11 @@ msgstr "Порты (COM и LPT)"
 msgid "Ports"
 msgstr "Порты"
 
-msgid "Serial ports"
-msgstr "Последовательные порты"
+msgid "Serial ports:"
+msgstr "Последовательные порты:"
 
-msgid "Parallel ports"
-msgstr "Параллельные порты"
+msgid "Parallel ports:"
+msgstr "Параллельные порты:"
 
 msgid "Storage controllers"
 msgstr "Контроллеры дисков"
@@ -2829,14 +2829,11 @@ msgstr "Режим концентратора"
 msgid "Hostname:"
 msgstr "Имя хоста:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA ОЗУ:"
 
-msgid "ISA RAM"
-msgstr "ISA ОЗУ"
-
-msgid "ISA ROM"
-msgstr "ISA ПЗУ"
+msgid "ISA ROM:"
+msgstr "ISA ПЗУ:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Стереть NVRAM"
diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po
index 45f9e6a01..34f9876c8 100644
--- a/src/qt/languages/sk-SK.po
+++ b/src/qt/languages/sk-SK.po
@@ -774,11 +774,11 @@ msgstr "COM a LPT porty"
 msgid "Ports"
 msgstr "Porty"
 
-msgid "Serial ports"
-msgstr "Sériové porty"
+msgid "Serial ports:"
+msgstr "Sériové porty:"
 
-msgid "Parallel ports"
-msgstr "Paralelné porty"
+msgid "Parallel ports:"
+msgstr "Paralelné porty:"
 
 msgid "Storage controllers"
 msgstr "Radiče úložiska"
@@ -2829,14 +2829,11 @@ msgstr "Režim hubu"
 msgid "Hostname:"
 msgstr "Hostiteľské meno"
 
-msgid "ISA RTC"
-msgstr "ISA hodiny"
+msgid "ISA RAM:"
+msgstr "ISA pamäť RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA pamäť RAM"
-
-msgid "ISA ROM"
-msgstr "ISA pamäť ROM"
+msgid "ISA ROM:"
+msgstr "ISA pamäť ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Vymazať NVRAM"
diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po
index 6224b14a6..588e30cc6 100644
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -774,11 +774,11 @@ msgstr "Vrata (COM & LPT)"
 msgid "Ports"
 msgstr "Vrata"
 
-msgid "Serial ports"
-msgstr "Serijska vrata"
+msgid "Serial ports:"
+msgstr "Serijska vrata:"
 
-msgid "Parallel ports"
-msgstr "Paralelna vrata"
+msgid "Parallel ports:"
+msgstr "Paralelna vrata:"
 
 msgid "Storage controllers"
 msgstr "Krmilniki shrambe"
@@ -2829,14 +2829,11 @@ msgstr "Način koncentratorja"
 msgid "Hostname:"
 msgstr "Ime gostitelja:"
 
-msgid "ISA RTC"
-msgstr "RČ ura ISA"
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
 
-msgid "ISA RAM"
-msgstr "RAM ISA"
-
-msgid "ISA ROM"
-msgstr "ROM ISA"
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Izbriši NVRAM"
diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po
index d0530cdb4..4f98052fb 100644
--- a/src/qt/languages/sv-SE.po
+++ b/src/qt/languages/sv-SE.po
@@ -774,11 +774,11 @@ msgstr "Portar (COM & LPT)"
 msgid "Ports"
 msgstr "Portar"
 
-msgid "Serial ports"
-msgstr "Serieportar"
+msgid "Serial ports:"
+msgstr "Serieportar:"
 
-msgid "Parallel ports"
-msgstr "Parallelportar"
+msgid "Parallel ports:"
+msgstr "Parallelportar:"
 
 msgid "Storage controllers"
 msgstr "Styrenheter för lagring"
@@ -2829,14 +2829,11 @@ msgstr "Hubb-läge"
 msgid "Hostname:"
 msgstr "Värdnamn:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Rensa NVRAM"
diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po
index f6029f347..e2b285d30 100644
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -774,11 +774,11 @@ msgstr "Bağlantı noktaları (COM & LPT)"
 msgid "Ports"
 msgstr "Bağlantı noktaları"
 
-msgid "Serial ports"
-msgstr "Seri bağlantı noktaları"
+msgid "Serial ports:"
+msgstr "Seri bağlantı noktaları:"
 
-msgid "Parallel ports"
-msgstr "Paralel bağlantı noktaları"
+msgid "Parallel ports:"
+msgstr "Paralel bağlantı noktaları:"
 
 msgid "Storage controllers"
 msgstr "Depolama denetleyicileri"
@@ -2829,14 +2829,11 @@ msgstr "Hub Modu"
 msgid "Hostname:"
 msgstr "Ana bilgisayar adı"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "NVRAM'i te&mizle"
diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po
index 875f6c57d..6e6ed4bfe 100644
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -774,11 +774,11 @@ msgstr "Порти (COM и LPT)"
 msgid "Ports"
 msgstr "Порти"
 
-msgid "Serial ports"
-msgstr "Послідовні порти"
+msgid "Serial ports:"
+msgstr "Послідовні порти:"
 
-msgid "Parallel ports"
-msgstr "Паралельні порти"
+msgid "Parallel ports:"
+msgstr "Паралельні порти:"
 
 msgid "Storage controllers"
 msgstr "Контролери дисків"
@@ -2829,14 +2829,11 @@ msgstr "Режим концентратора"
 msgid "Hostname:"
 msgstr "Ім'я хоста:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA ОЗУ:"
 
-msgid "ISA RAM"
-msgstr "ISA ОЗУ"
-
-msgid "ISA ROM"
-msgstr "ISA ПЗУ"
+msgid "ISA ROM:"
+msgstr "ISA ПЗУ:"
 
 msgid "&Wipe NVRAM"
 msgstr "&Стерти NVRAM"
diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po
index 570dbec49..f7a535a65 100644
--- a/src/qt/languages/vi-VN.po
+++ b/src/qt/languages/vi-VN.po
@@ -774,11 +774,11 @@ msgstr "Cổng (COM và LPT)"
 msgid "Ports"
 msgstr "Cổng"
 
-msgid "Serial ports"
-msgstr "Cổng serial"
+msgid "Serial ports:"
+msgstr "Cổng serial:"
 
-msgid "Parallel ports"
-msgstr "Cổng parallel"
+msgid "Parallel ports:"
+msgstr "Cổng parallel:"
 
 msgid "Storage controllers"
 msgstr "Vi điều khiển bộ nhớ ổ cứng"
@@ -2829,14 +2829,11 @@ msgstr "Chế độ hub"
 msgid "Hostname:"
 msgstr "Tên host:"
 
-msgid "ISA RTC"
-msgstr "ISA RTC"
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
 
-msgid "ISA RAM"
-msgstr "ISA RAM"
-
-msgid "ISA ROM"
-msgstr "ISA ROM"
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
 
 msgid "&Wipe NVRAM"
 msgstr "Xóa sạch NVRAM"
diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po
index 3819a5ed2..103b67cf5 100644
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -774,10 +774,10 @@ msgstr "端口 (COM 和 LPT)"
 msgid "Ports"
 msgstr ""
 
-msgid "Serial ports"
+msgid "Serial ports:"
 msgstr ""
 
-msgid "Parallel ports"
+msgid "Parallel ports:"
 msgstr ""
 
 msgid "Storage controllers"
@@ -2829,13 +2829,10 @@ msgstr ""
 msgid "Hostname:"
 msgstr ""
 
-msgid "ISA RTC"
+msgid "ISA RAM:"
 msgstr ""
 
-msgid "ISA RAM"
-msgstr ""
-
-msgid "ISA ROM"
+msgid "ISA ROM:"
 msgstr ""
 
 msgid "&Wipe NVRAM"
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index 56eb7778e..8f6700c0c 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -774,10 +774,10 @@ msgstr "連接埠 (COM 和 LPT)"
 msgid "Ports"
 msgstr ""
 
-msgid "Serial ports"
+msgid "Serial ports:"
 msgstr ""
 
-msgid "Parallel ports"
+msgid "Parallel ports:"
 msgstr ""
 
 msgid "Storage controllers"
@@ -2829,13 +2829,10 @@ msgstr ""
 msgid "Hostname:"
 msgstr ""
 
-msgid "ISA RTC"
+msgid "ISA RAM:"
 msgstr ""
 
-msgid "ISA RAM"
-msgstr ""
-
-msgid "ISA ROM"
+msgid "ISA ROM:"
 msgstr ""
 
 msgid "&Wipe NVRAM"
diff --git a/src/qt/qt_about.cpp b/src/qt/qt_about.cpp
index 96cde8522..6c34c2add 100644
--- a/src/qt/qt_about.cpp
+++ b/src/qt/qt_about.cpp
@@ -51,7 +51,7 @@ About::About(QWidget *parent)
 #endif
     versioninfo.append(QString(" [%1, %2]").arg(QSysInfo::buildCpuArchitecture(), tr(DYNAREC_STR)));
     setText(QString("<b>%3%1%2</b>").arg(EMU_VERSION_FULL, versioninfo, tr("86Box v")));
-    setInformativeText(tr("An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."));
+    setInformativeText(tr("An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information.").replace("\n", "<br>"));
     setWindowTitle(tr("About 86Box"));
     const auto closeButton = addButton("OK", QMessageBox::ButtonRole::AcceptRole);
     setEscapeButton(closeButton);
diff --git a/src/qt/qt_vmmanager_addmachine.cpp b/src/qt/qt_vmmanager_addmachine.cpp
index 111717e0d..ce62c9ca3 100644
--- a/src/qt/qt_vmmanager_addmachine.cpp
+++ b/src/qt/qt_vmmanager_addmachine.cpp
@@ -149,7 +149,6 @@ WithExistingConfigPage(QWidget *parent)
 void
 WithExistingConfigPage::chooseExistingConfigFile()
 {
-    // TODO: FIXME: This is using the CLI arg and needs to instead use a proper variable
     const auto startDirectory = QString(vmm_path);
     const auto selectedConfigFile = QFileDialog::getOpenFileName(this, tr("Choose configuration file"),
                                                 startDirectory,
@@ -228,7 +227,6 @@ NameAndLocationPage(QWidget *parent)
 #ifdef CUSTOM_SYSTEM_LOCATION
     const auto systemLocationLabel = new QLabel(tr("System location:"));
     systemLocation           = new QLineEdit();
-    // TODO: FIXME: This is using the CLI arg and needs to instead use a proper variable
     systemLocation->setText(QDir::toNativeSeparators(vmm_path));
     registerField("systemLocation*", systemLocation);
     systemLocationValidation = new QLabel();
@@ -285,7 +283,6 @@ NameAndLocationPage::nextId() const
 void
 NameAndLocationPage::chooseDirectoryLocation()
 {
-    // TODO: FIXME: This is pulling in the CLI directory! Needs to be set properly elsewhere
     const auto directory = QFileDialog::getExistingDirectory(this, "Choose directory", QDir(vmm_path).path());
     systemLocation->setText(QDir::toNativeSeparators(directory));
     emit completeChanged();
diff --git a/src/qt/qt_vmmanager_main.cpp b/src/qt/qt_vmmanager_main.cpp
index 2fac88da2..8859d5cec 100644
--- a/src/qt/qt_vmmanager_main.cpp
+++ b/src/qt/qt_vmmanager_main.cpp
@@ -601,7 +601,7 @@ VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QStri
     const auto newSystemDirectory = QDir(QDir::cleanPath(dir + "/" + name));
 
     // qt replaces `/` with native separators
-    const auto newSystemConfigFile = QFileInfo(newSystemDirectory.path() + "/" + "86box.cfg");
+    const auto newSystemConfigFile = QFileInfo(newSystemDirectory.path() + "/" + CONFIG_FILE);
     if (newSystemConfigFile.exists() || newSystemDirectory.exists()) {
         QMessageBox::critical(this, tr("Directory in use"), tr("The selected directory is already in use. Please select a different directory."));
         return;
@@ -774,6 +774,7 @@ void
 VMManagerMain::onLanguageUpdated()
 {
     vm_model->refreshConfigs();
+    modelDataChange();
     /* Hack to work around details widgets not being re-translatable
        without going through layers of abstraction */
     ui->detailsArea->layout()->removeWidget(vm_details);
@@ -810,7 +811,7 @@ VMManagerMain::backgroundUpdateCheckComplete(const UpdateCheck::UpdateResult &re
     qDebug() << "Check complete: update available?" << result.updateAvailable;
     if (result.updateAvailable) {
         auto type = result.channel == UpdateCheck::UpdateChannel::CI ? tr("build") : tr("version");
-        const auto updateMessage = QString("An update to 86Box is available: %1 %2").arg(type, result.latestVersion);
+        const auto updateMessage = tr("An update to 86Box is available: %1 %2").arg(type, result.latestVersion);
         emit updateStatusLeft(updateMessage);
     }
 }
diff --git a/src/qt/qt_vmmanager_preferences.cpp b/src/qt/qt_vmmanager_preferences.cpp
index 91cbcb7fd..0f01fb45e 100644
--- a/src/qt/qt_vmmanager_preferences.cpp
+++ b/src/qt/qt_vmmanager_preferences.cpp
@@ -41,10 +41,10 @@ VMManagerPreferences(QWidget *parent) : ui(new Ui::VMManagerPreferences)
     const auto configSystemDir = QString(vmm_path_cfg);
     if(!configSystemDir.isEmpty()) {
         // Prefer this one
-        ui->systemDirectory->setText(configSystemDir);
+        ui->systemDirectory->setText(QDir::toNativeSeparators(configSystemDir));
     } else if(!QString(vmm_path).isEmpty()) {
         // If specified on command line
-        ui->systemDirectory->setText(QDir(vmm_path).path());
+        ui->systemDirectory->setText(QDir::toNativeSeparators(QDir(vmm_path).path()));
     }
 
     ui->comboBoxLanguage->setItemData(0, 0);
@@ -77,8 +77,7 @@ VMManagerPreferences()
 void
 VMManagerPreferences::chooseDirectoryLocation()
 {
-    // TODO: FIXME: This is pulling in the CLI directory! Needs to be set properly elsewhere
-    const auto directory = QFileDialog::getExistingDirectory(this, tr("Choose directory"), QDir(vmm_path).path());
+    const auto directory = QFileDialog::getExistingDirectory(this, tr("Choose directory"), ui->systemDirectory->text());
     ui->systemDirectory->setText(QDir::toNativeSeparators(directory));
 }
 
@@ -93,7 +92,7 @@ VMManagerPreferences::accept()
 {
     const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
 
-    strncpy(vmm_path_cfg, ui->systemDirectory->text().toUtf8().constData(), sizeof(vmm_path_cfg) - 1);
+    strncpy(vmm_path_cfg, QDir::cleanPath(ui->systemDirectory->text()).toUtf8().constData(), sizeof(vmm_path_cfg) - 1);
     lang_id = ui->comboBoxLanguage->currentData().toInt();
     config_save_global();
 
diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp
index c7f03a71e..72d6f2eea 100644
--- a/src/qt/qt_vmmanager_system.cpp
+++ b/src/qt/qt_vmmanager_system.cpp
@@ -139,22 +139,10 @@ VMManagerSystem::scanForConfigs(QWidget* parent, const QString &searchPath)
     scanTimer.start();
     QVector<VMManagerSystem *> system_configs;
 
-    const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
-    auto systemDirConfig = config->getStringValue("system_directory");
-
-    const auto config_file_name = QString("86box.cfg");
+    const auto config_file_name = QString(CONFIG_FILE);
     const QStringList filters = {config_file_name};
     QStringList matches;
-    // TODO: Preferences. Once I get the CLI args worked out.
-    // For now it just takes vmm_path from the CLI
     QString search_directory;
-    // if(searchPath.isEmpty()) {
-    //     // If the location isn't specified in function call, use the one loaded
-    //     // from the config file
-    //     search_directory = systemDirConfig;
-    // } else {
-    //     search_directory = searchPath;
-    // }
 
     search_directory = searchPath.isEmpty()? vmm_path : searchPath;