diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 83d90b5aa..c03076fbf 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -489,7 +489,7 @@ void PhysicalJoystickHandler::defineControllerMappings(const Controller::Type ty
                                                        const Properties& properties)
 {
   // Determine controller events to use
-  if(type == Controller::Type::QuadTari) 
+  if(type == Controller::Type::QuadTari)
   {
     if(port == Controller::Jack::Left)
     {
@@ -501,7 +501,7 @@ void PhysicalJoystickHandler::defineControllerMappings(const Controller::Type ty
       myRightMode = getMode(properties, PropType::Controller_Right1);
       myRight2ndMode = getMode(properties, PropType::Controller_Right2);
     }
-  }   
+  }
   else
   {
     const EventMode mode = getMode(type);
@@ -729,7 +729,7 @@ bool PhysicalJoystickHandler::isDrivingEvent(const Event::Type event)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool PhysicalJoystickHandler::isCommonEvent(const Event::Type event)
 {
-  return !(isJoystickEvent(event) || isPaddleEvent(event) 
+  return !(isJoystickEvent(event) || isPaddleEvent(event)
     || isKeyboardEvent(event) || isDrivingEvent(event));
 }
 
diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 6a05eab1e..aa2707919 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -1333,13 +1333,13 @@ string CartDebug::saveDisassembly(string path)
           out << "\n";
         out << ALIGN(16) << ourZPMnemonic[addr - 0x80] << "= $"
           << Base::HEX2 << right << (addr)
-          << ((stackUsed|codeUsed) ? "; (" : "")
+          << ((stackUsed || codeUsed) ? "; (" : "")
           << (codeUsed ? "c" : "")
           << (stackUsed ? "s" : "")
-          << ((stackUsed | codeUsed) ? ")" : "")
+          << ((stackUsed || codeUsed) ? ")" : "")
           << "\n";
         addLine = false;
-      } else if (ramUsed|codeUsed|stackUsed) {
+      } else if (ramUsed || codeUsed || stackUsed) {
         if (addLine)
           out << "\n";
         out << ALIGN(18) << ";" << "$"