diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c
index c4d4ed53a..d1eafef79 100644
--- a/src/machine/m_pcjr.c
+++ b/src/machine/m_pcjr.c
@@ -743,17 +743,17 @@ static const device_config_t pcjr_config[] = {
 };
 
 const device_t pcjr_device = {
-    "IBM PCjr",
-    "pcjr",
-    0,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    { NULL },
-    speed_changed,
-    NULL,
-    pcjr_config
+    .name          = "IBM PCjr",
+    .internal_name = "pcjr",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    { .available = NULL },
+    .speed_changed = speed_changed,
+    .force_redraw  = NULL,
+    .config        = pcjr_config
 };
 
 int
diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp
index 609c76fc0..4d2f6e9f9 100644
--- a/src/qt/qt_settingsfloppycdrom.cpp
+++ b/src/qt/qt_settingsfloppycdrom.cpp
@@ -90,14 +90,6 @@ setCDROMSpeed(QAbstractItemModel *model, const QModelIndex &idx, uint8_t speed)
     model->setData(i, speed, Qt::UserRole);
 }
 
-static void
-setCDROMEarly(QAbstractItemModel *model, const QModelIndex &idx, bool early)
-{
-    auto i = idx.siblingAtColumn(2);
-    model->setData(i, (early == true) ? QObject::tr("On") : QObject::tr("Off"));
-    model->setData(i, early, Qt::UserRole);
-}
-
 static void
 setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
diff --git a/src/sio/sio_fdc37c669.c b/src/sio/sio_fdc37c669.c
index a8bc4d700..219213d69 100644
--- a/src/sio/sio_fdc37c669.c
+++ b/src/sio/sio_fdc37c669.c
@@ -338,9 +338,9 @@ const device_t fdc37c669_370_device = {
     .internal_name = "fdc37c669_370",
     .flags         = 0,
     .local         = 1,
-    fdc37c669_init,
-    fdc37c669_close,
-    .reset = NULL,
+    .init          = fdc37c669_init,
+    .close         = fdc37c669_close,
+    .reset         = NULL,
     { .available = NULL },
     .speed_changed = NULL,
     .force_redraw  = NULL,
diff --git a/src/sio/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c
index 55464ec98..110289f1f 100644
--- a/src/sio/sio_fdc37c93x.c
+++ b/src/sio/sio_fdc37c93x.c
@@ -793,17 +793,17 @@ access_bus_init(const device_t *info)
 }
 
 static const device_t access_bus_device = {
-    "SMC FDC37C932FR ACCESS.bus",
-    "access_bus",
-    0,
-    0x03,
-    access_bus_init,
-    access_bus_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name          = "SMC FDC37C932FR ACCESS.bus",
+    .internal_name = "access_bus",
+    .flags         = 0,
+    .local         = 0x03,
+    .init          = access_bus_init,
+    .close         = access_bus_close,
+    .reset         = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
 };
 
 static void