diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
index 137d0a529a..f732a5c168 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
@@ -86,9 +86,20 @@ RageSound_CA::RageSound_CA()
     {
         RageException::ThrowNonfatal("Couldn't create default output device.");
     }
+    AudioStreamID sID = mOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 );
+    CAAudioHardwareStream stream( sID );
     try
     {
         UInt32 frames = mOutputDevice->GetLatency(kAudioDeviceSectionOutput);
+        if (stream.HasProperty(0, kAudioDevicePropertyLatency))
+        {
+            UInt32 t, size = 4;
+            
+            stream.GetPropertyData(0, kAudioDevicePropertyLatency, size, &t);
+            frames += t;
+        }
+        else
+            LOG->Warn("Stream reports no latency.");
         mLatency = frames / 44100.0;
         LOG->Info("Frames of latency:  %lu\n"
                   "Seconds of latency: %f", frames, mLatency);
@@ -98,9 +109,27 @@ RageSound_CA::RageSound_CA()
         delete mOutputDevice;
         RageException::ThrowNonfatal("Couldn't get Latency.");
     }
+    try
+    {
+        UInt32 bufferSize = mOutputDevice->GetIOBufferSize();
+        LOG->Info("I/O Buffer size: %lu", bufferSize);
+    }
+    catch (const CAException& e)
+    {
+        LOG->Warn("Could not determine buffer size.");
+    }
+    try
+    {
+        mOutputDevice->AddPropertyListener(kAudioPropertyWildcardChannel,
+                                           kAudioPropertyWildcardSection,
+                                           kAudioDeviceProcessorOverload,
+                                           OverloadListener, this);
+    }
+    catch (const CAException& e)
+    {
+        LOG->Warn("Could not install the overload listener.");
+    }
     
-    AudioStreamID sID = mOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 );
-    CAAudioHardwareStream stream( sID );
 
     vector<Desc> physicalFormats;
     GetPhysicalFormats( sID, physicalFormats );
@@ -189,6 +218,16 @@ OSStatus RageSound_CA::GetData(AudioDeviceID inDevice,
     return noErr;
 }
 
+OSStatus RageSound_CA::OverloadListener(AudioDeviceID inDevice,
+                                        UInt32 inChannel,
+                                        Boolean isInput,
+                                        AudioDevicePropertyID inPropertyID,
+                                        void *inData)
+{
+    LOG->Warn("Audio device overload.");
+    return noErr;
+}
+
 void RageSound_CA::SetupDecodingThread()
 {
 	/* Increase the scheduling precedence of the decoder thread. */
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.h b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
index e594f8e500..a9b494abc8 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_CA.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
@@ -7,6 +7,8 @@ struct AudioTimeStamp;
 struct AudioBufferList;
 typedef unsigned long UInt32;
 typedef UInt32 AudioDeviceID;
+typedef UInt32 AudioDevicePropertyID;
+typedef unsigned char Boolean;
 typedef long OSStatus;
 class CAAudioHardwareDevice;
 class RageSoundBase;
@@ -25,7 +27,12 @@ private:
                             AudioBufferList *outOutputData,
                             const AudioTimeStamp *inOutputTime,
                             void *inClientData);
-
+    static OSStatus OverloadListener(AudioDeviceID inDevice,
+                                     UInt32 inChannel,
+                                     Boolean isInput,
+                                     AudioDevicePropertyID inPropertyID,
+                                     void *inData);
+                              
 public:
     void FillConverter(void *data, UInt32 dataByteSize);
     RageSound_CA();