diff --git a/docs/index.html b/docs/index.html
index 8bbc4bbc5..c15ee4e13 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3236,6 +3236,7 @@ Ms Pac-Man (Stella extended codes):
         <tr><td>BF </td><td>CPUWIZ 256K </td></tr>
         <tr><td>BFSC </td><td>CPUWIZ 256K + ram</td></tr>
         <tr><td>CM &#185;</td><td>Spectravideo CompuMate </td></tr>
+        <tr><td>CTY &#185;&#178;</td><td>CDW - Chetiry </td></tr>
         <tr><td>CV </td><td>Commavid extra ram </td></tr>
         <tr><td>CV+ </td><td>Extended Commavid extra ram</td></tr>
         <tr><td>DASH </td><td>Boulder Dash 2 </td></tr>
diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index 725a1daaa..1cb69003e 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -160,7 +160,7 @@ inline size_t BSPF_findIgnoreCase(const string& s1, const string& s2, int startp
     s2.begin(), s2.end(), [](char ch1, char ch2) {
       return toupper(uInt8(ch1)) == toupper(uInt8(ch2));
     });
-  return pos == s1.end() ? string::npos : pos - (s1.begin()+startpos);
+  return pos == s1.end() ? string::npos : size_t(pos - (s1.begin()+startpos));
 }
 
 // Test whether the first string ends with the second one (case insensitive)
diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx
index af4626416..eb15c773f 100644
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@@ -981,9 +981,10 @@ Cartridge::BankswitchType Cartridge::ourBSList[ourNumBSTypes] = {
   { "AR",       "AR (Supercharger)"             },
   { "BF",       "BF (CPUWIZ 256K)"              },
   { "BFSC",     "BFSC (CPUWIZ 256K + ram)"      },
+  { "CM",       "CM (SpectraVideo CompuMate)"   },
+  { "CTY",      "CTY (CDW - Chetiry)"           },
   { "CV",       "CV (Commavid extra ram)"       },
   { "CV+",      "CV+ (Extended Commavid)"       },
-  { "CM",       "CM (SpectraVideo CompuMate)"   },
   { "DASH",     "DASH (Experimental)"           },
   { "DF",       "DF (CPUWIZ 128K)"              },
   { "DFSC",     "DFSC (CPUWIZ 128K + ram)"      },
diff --git a/src/emucore/Cart.hxx b/src/emucore/Cart.hxx
index 715bd274d..b9b878162 100644
--- a/src/emucore/Cart.hxx
+++ b/src/emucore/Cart.hxx
@@ -190,7 +190,7 @@ class Cartridge : public Device
       const char* type;
       const char* desc;
     };
-    enum { ourNumBSTypes = 46 };
+    enum { ourNumBSTypes = 47 };
     static BankswitchType ourBSList[ourNumBSTypes];
 
   protected:
diff --git a/src/unix/FSNodePOSIX.cxx b/src/unix/FSNodePOSIX.cxx
index 31deeaeef..56e4257a5 100644
--- a/src/unix/FSNodePOSIX.cxx
+++ b/src/unix/FSNodePOSIX.cxx
@@ -236,5 +236,5 @@ AbstractFSNode* FilesystemNodePOSIX::getParent() const
   const char* start = _path.c_str();
   const char* end = lastPathComponent(_path);
 
-  return new FilesystemNodePOSIX(string(start, end - start));
+  return new FilesystemNodePOSIX(string(start, size_t(end - start)));
 }