diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index da65bf1f0..d3eb878d6 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -86,9 +86,9 @@ using StringList = std::vector<std::string>;
 using ByteBuffer = std::unique_ptr<uInt8[]>;
 
 // We use KB a lot; let's make a literal for it
-constexpr size_t operator "" _KB(unsigned long long size)
+constexpr uInt32 operator "" _KB(unsigned long long size)
 {
-   return static_cast<size_t>(size * 1024);
+   return static_cast<uInt32>(size * 1024);
 }
 
 static const string EmptyString("");
diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx
index 57c2bb5fc..b8e15ff90 100644
--- a/src/debugger/DebuggerParser.cxx
+++ b/src/debugger/DebuggerParser.cxx
@@ -108,7 +108,7 @@ string DebuggerParser::run(const string& command)
   getArgs(command, verb);
   commandResult.str("");
 
-  for(size_t i = 0; i < commands.size(); ++i)
+  for(int i = 0; i < commands.size(); ++i)
   {
     if(BSPF::equalsIgnoreCase(verb, commands[i].cmdString))
     {
diff --git a/src/debugger/gui/Cart2KWidget.cxx b/src/debugger/gui/Cart2KWidget.cxx
index 09478e6f6..68a98d76f 100644
--- a/src/debugger/gui/Cart2KWidget.cxx
+++ b/src/debugger/gui/Cart2KWidget.cxx
@@ -25,7 +25,7 @@ Cartridge2KWidget::Cartridge2KWidget(
   : CartDebugWidget(boss, lfont, nfont, x, y, w, h)
 {
   // Eventually, we should query this from the debugger/disassembler
-  uInt16 size = cart.mySize;
+  size_t size = cart.mySize;
   uInt16 start = (cart.myImage[size-3] << 8) | cart.myImage[size-4];
   start -= start % size;