diff --git a/src/prefs/devices/ConfigurationWindow.cpp b/src/prefs/devices/ConfigurationWindow.cpp
index b6c86f42e5..7d9ec7794b 100644
--- a/src/prefs/devices/ConfigurationWindow.cpp
+++ b/src/prefs/devices/ConfigurationWindow.cpp
@@ -334,9 +334,9 @@ ConfigurationWindow::InitWindow(void)
 					char value[50];
 					sprintf(value, "%d", j);
 					BMenuItem *item = new BMenuItem(value, new BMessage(DMA_CHANGED));
-					fDMAMenu[k++]->AddItem(item);
+					fDMAMenu[k]->AddItem(item);
 					item->SetMarked(true);
-					fDMAField[k]->SetEnabled(true);
+					fDMAField[k++]->SetEnabled(true);
 				}
 		}
 	}
diff --git a/src/prefs/devices/DevicesWindow.cpp b/src/prefs/devices/DevicesWindow.cpp
index 71a8af1c90..44feb9fb5a 100644
--- a/src/prefs/devices/DevicesWindow.cpp
+++ b/src/prefs/devices/DevicesWindow.cpp
@@ -422,7 +422,7 @@ DevicesWindow::UpdateDeviceInfo()
 					for (;mask;mask>>=1,i++)
 						if (mask & 1) {
 							char value[50];
-							sprintf(value, "%s%d", first ? "" : ",", i);
+							sprintf(value, "%s%d", first ? "" : ", ", i);
 							text += value;
 							first = false;
 						}
@@ -446,7 +446,7 @@ DevicesWindow::UpdateDeviceInfo()
 					for (;mask;mask>>=1,i++)
 						if (mask & 1) {
 							char value[50];
-							sprintf(value, "%s%d", first ? "" : ",", i);
+							sprintf(value, "%s%d", first ? "" : ", ", i);
 							text += value;
 							first = false;
 						}
@@ -511,4 +511,4 @@ DevicesWindow::BlankDeviceInfoBox()
 	stvIORanges->SetText("IO Ranges: ");
 	stvMemoryRanges->SetText("Memory Ranges: ");
 	btnConfigure->SetEnabled(false);
-}
\ No newline at end of file
+}