diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx
index a690251f7..695a08203 100644
--- a/src/debugger/gui/RomListWidget.cxx
+++ b/src/debugger/gui/RomListWidget.cxx
@@ -136,7 +136,7 @@ void RomListWidget::setList(const CartDebug::Disassembly& disasm)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomListWidget::setSelected(int item)
 {
-  if(item < -1 || item >= static_cast<int>(myDisasm->list.size()))
+  if(item < -1 || std::cmp_greater_equal(item, myDisasm->list.size()))
     return;
 
   if(isEnabled())
diff --git a/src/emucore/CartAR.hxx b/src/emucore/CartAR.hxx
index f5b905381..485fb6be6 100644
--- a/src/emucore/CartAR.hxx
+++ b/src/emucore/CartAR.hxx
@@ -103,7 +103,7 @@ class CartridgeAR : public Cartridge
       @param bank  The bank to get the size for
       @return  The bank's size
     */
-    uInt16 bankSize(uInt16 bank = 0) const override { return 4_KB; };
+    uInt16 bankSize(uInt16 bank) const override { return static_cast<uInt16>(4_KB); };
 
     /**
       Patch the cartridge ROM.
diff --git a/src/emucore/CartCM.hxx b/src/emucore/CartCM.hxx
index 6d624b588..3eddc83d4 100644
--- a/src/emucore/CartCM.hxx
+++ b/src/emucore/CartCM.hxx
@@ -47,8 +47,12 @@ class System;
            D6 = Audio out to tape player and 4017 CLK
                 1 -> increase key column (0 to 9)
            D5 = 4017 RST, and RAM direction. (high = write, low = read)
-                1 -> reset key column to 0 (if D4 = 0)
-                0 -> enable RAM writing (if D4 = 1)
+                if D4 = 1:
+                   0 -> enable key column CLK via D6
+                   1 -> reset key column to 0 (CLK via D6 disabled)
+                if D4 = 0:
+                   0 -> enable RAM writing
+                   1 -> enable RAM read
            D4 = RAM enable: 1 = disable RAM, 0 = enable RAM
            D3 = keyboard row 3 input (0 = key pressed)
            D2 = keyboard row 1 input (0 = key pressed)