diff --git a/src/emucore/Paddles.cxx b/src/emucore/Paddles.cxx
index 1da557097..df53a524c 100644
--- a/src/emucore/Paddles.cxx
+++ b/src/emucore/Paddles.cxx
@@ -430,4 +430,6 @@ int Paddles::DEJITTER_BASE = 0;
 int Paddles::DEJITTER_DIFF = 0;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-const std::array<Controller::DigitalPin, 2> Paddles::ourButtonPin;
+const std::array<Controller::DigitalPin, 2> Paddles::ourButtonPin = {
+  DigitalPin::Four, DigitalPin::Three
+};
diff --git a/src/emucore/Paddles.hxx b/src/emucore/Paddles.hxx
index e0d6dcc34..8eb510e17 100644
--- a/src/emucore/Paddles.hxx
+++ b/src/emucore/Paddles.hxx
@@ -162,9 +162,7 @@ class Paddles : public Controller
 
     // Lookup table for associating paddle buttons with controller pins
     // Yes, this is hideously complex
-    static constexpr std::array<Controller::DigitalPin, 2> ourButtonPin = {
-      DigitalPin::Four, DigitalPin::Three
-    };
+    static const std::array<Controller::DigitalPin, 2> ourButtonPin;
 
   private:
     // Following constructors and assignment operators not supported
diff --git a/src/gui/RadioButtonWidget.cxx b/src/gui/RadioButtonWidget.cxx
index dad6c52df..65ea729a9 100644
--- a/src/gui/RadioButtonWidget.cxx
+++ b/src/gui/RadioButtonWidget.cxx
@@ -122,12 +122,14 @@ void RadioButtonWidget::drawWidget(bool hilite)
   // Draw the outer bounding circle
   s.drawBitmap(radio_img_outercircle.data(), _x, _y + _boxY,
                hilite ? kWidColorHi : kColor,
-               radio_img_outercircle.size(), radio_img_outercircle.size());
+               static_cast<uInt32>(radio_img_outercircle.size()),
+               static_cast<uInt32>(radio_img_outercircle.size()));
 
   // Draw the inner bounding circle with enabled color
   s.drawBitmap(radio_img_innercircle.data(), _x + 1, _y + _boxY + 1,
                isEnabled() ? _bgcolor : kColor,
-               radio_img_innercircle.size(), radio_img_innercircle.size());
+               static_cast<uInt32>(radio_img_innercircle.size()),
+               static_cast<uInt32>(radio_img_innercircle.size()));
 
   // draw state
   if(_state)