diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c
index 5656181f0..5b471b754 100644
--- a/src/disk/hdc_esdi_mca.c
+++ b/src/disk/hdc_esdi_mca.c
@@ -1514,7 +1514,7 @@ esdi_integrated_device = {
     .init = esdi_init,
     .close = esdi_close,
     .reset = esdi_reset,
-    {.available = NULL },
+    .available = esdi_available,
     .speed_changed = NULL,
     .force_redraw = NULL,
     .config = esdi_integrated_config
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 243df4ca5..1692a7aaa 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -722,7 +722,7 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                 if ((val & 4) && !(fdc->dor & 4))
                     fdc_soft_reset(fdc);
                 /* We can now simplify this since each motor now spins separately. */
-                for (i = 0; i < FDD_NUM; i++) {
+                for (int i = 0; i < FDD_NUM; i++) {
                     drive_num = real_drive(fdc, i);
                     if ((!fdd_get_flags(drive_num)) || (drive_num >= FDD_NUM))
                         val &= ~(0x10 << drive_num);
@@ -1284,25 +1284,6 @@ fdc_read(uint16_t addr, void *priv)
                 if (fdc->fintr || fdc->reset_stat) /* INTR */
                     ret |= 0x80;
             }
-            else if (fdc->flags & FDC_FLAG_PS2) {
-                /* Status Register A (PS/2, PS/55) */
-                /* | INT PEND | nDRV2 | STEP | nTRK0 | HDSEL | nIDX | nWP | DIR | */
-                ret = 0x04;
-                if (!fdc->seek_dir) /* DIRECTION */
-                    ret |= 0x01;
-                if (!writeprot[drive]) /* nWRITEPROT */
-                    ret |= 0x02;
-                if (fdd_get_head(drive)) /* HDSEL */
-                    ret |= 0x08;
-                if (!fdd_track0(drive)) /* nTRK0 */
-                    ret |= 0x10;
-                if (fdc->step) /* STEP */
-                    ret |= 0x20;
-                if (!fdd_get_type(1)) /* -Drive 2 Installed */
-                    ret |= 0x40;
-                if (fdc->fintr || fdc->reset_stat) /* INTR */
-                    ret |= 0x80;
-            }
             else
                 ret = 0xff;
             break;
diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c
index c355ba4b2..b948c984c 100644
--- a/src/machine/m_ps2_mca.c
+++ b/src/machine/m_ps2_mca.c
@@ -780,13 +780,13 @@ ps55_model_50tv_write(uint16_t port, uint8_t val)
             switch ((val >> 5) & 3)
             {
             case 0:
-                lpt1_init(LPT_MDA_ADDR);
+                lpt1_setup(LPT_MDA_ADDR);
                 break;
             case 1:
-                lpt1_init(LPT1_ADDR);
+                lpt1_setup(LPT1_ADDR);
                 break;
             case 2:
-                lpt1_init(LPT2_ADDR);
+                lpt1_setup(LPT2_ADDR);
                 break;
             default:
                 break;
diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
index abbc3de16..98b827421 100644
--- a/src/video/vid_ps55da2.c
+++ b/src/video/vid_ps55da2.c
@@ -3205,7 +3205,7 @@ const device_t ps55da2_device = {
     .init          = da2_init,
     .close         = da2_close,
     .reset         = da2_reset,
-    { .available = da2_available },
+    .available     = da2_available,
     .speed_changed = da2_speed_changed,
     .force_redraw  = da2_force_redraw,
     .config        = da2_configuration