diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 798438c97..f5d613bd5 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -1107,8 +1107,13 @@ void AudioIO::HandleDeviceChange()
       return;
 
    // get the selected record and playback devices
-   int playDeviceNum = getPlayDevIndex();
-   int recDeviceNum = getRecordDevIndex();
+   const int playDeviceNum = getPlayDevIndex();
+   const int recDeviceNum = getRecordDevIndex();
+
+   // If no change needed, return
+   if (mCachedPlaybackIndex == playDeviceNum &&
+       mCachedCaptureIndex == recDeviceNum)
+       return;
 
    // cache playback/capture rates
    mCachedPlaybackRates = GetSupportedPlaybackRates(playDeviceNum);
diff --git a/src/Theme.cpp b/src/Theme.cpp
index 88f2aabfd..f7b47b58e 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -383,7 +383,7 @@ void ThemeBase::RegisterImage( int &iIndex, const wxImage &Image, const wxString
    wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice!
    mImages.Add( Image );
 
-#ifdef __WXMAC__
+#ifdef __APPLE__
    // On Mac, bitmaps with alpha don't work.
    // So we convert to a mask and use that.
    // It isn't quite as good, as alpha gives smoother edges.