diff --git a/src/machine/m_at_socket2.c b/src/machine/m_at_socket2.c
index 673794fcc..7a73baf4a 100644
--- a/src/machine/m_at_socket2.c
+++ b/src/machine/m_at_socket2.c
@@ -92,7 +92,7 @@ machine_at_acera1g_init(const machine_t *model)
     device_add(&ali1429g_device);
 
     if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5428_onboard_device);
+        device_add(machine_get_vid_device(machine));
 
     device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
@@ -345,8 +345,9 @@ machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2
     device_add(&sis_85c461_device);
 
     if (gfxcard[0] == VID_INTERNAL)
-        device_add(machine_get_vid_device(machine));
-    else {
+        device_add(&et4000w32_onboard_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
         for (uint16_t i = 0; i < 32768; i++)
             rom[i] = mem_readb_phys(0x000c0000 + i);
 
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 4da660548..4500dd1cb 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -12069,7 +12069,7 @@ const machine_t machines[] = {
         .kbd_device               = NULL,
         .fdc_device               = NULL,
         .sio_device               = NULL,
-        .vid_device               = &s3_phoenix_vision864_pci_device,
+        .vid_device               = &s3_phoenix_vision864_pci_device,  /* Onboard variant not yet emulated */
         .snd_device               = NULL,
         .net_device               = NULL
     },
diff --git a/src/sound/snd_cs423x.c b/src/sound/snd_cs423x.c
index 4fd630e07..b9004454e 100644
--- a/src/sound/snd_cs423x.c
+++ b/src/sound/snd_cs423x.c
@@ -1203,7 +1203,7 @@ const device_t cs4236b_device = {
 };
 
 const device_t cs4236b_onboard_device = {
-    .name          = "Crystal CS4236B",
+    .name          = "Crystal CS4236B (On-Board)",
     .internal_name = "cs4236b",
     .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4236B | CRYSTAL_NOEEPROM,